From d0feb5c75a63896dc85913059958131db1a6bf41 Mon Sep 17 00:00:00 2001
From: Matthew Flatt <mflatt@racket-lang.org>
Date: Wed, 17 Mar 2021 12:52:46 -0600
Subject: [PATCH] move `memq` and `memv` back to core

This commit partly reverts c305dba649 and 88fc9a979f, which was
discusssed in #366.

The original discussion was about allowing an extra argument to
`member` to pick the equality predicate. That change is still in place
in the same (private) Racket module.

The `memq` and `memv` functions are in Scheme for Racket CS and back
to being and in C for Racket BC. The old motivation for moving `memv`
and `memq` --- to get them out of C --- is subsumed by the switch to
CS (granting that some C code got added back to BC meanwhile). The
advantage of moving `memq` and `memv` back to the runtime core is that
the compiler can do more with them, at least in CS.

When `memq` and `memv` were moved previously, they lost checking for
cyclic lists. That wasn't discussed and presumably wasn't on purpose;
check is restored here, including for `member`.

There's no significant performance change in CS, except in cases like
`(memq x '(a b c))` that the compiler unpacks into a combination of
`eq?`s. For BC, the C version is a little faster (10-40%, depending on
the length of the list), but still slower than CS (probably because
`pair?` is slower, which due to representation differences).
---
 pkgs/base/info.rkt                            |   2 +-
 pkgs/racket-test-core/tests/racket/basic.rktl |   5 +-
 racket/collects/racket/private/member.rkt     |  81 +-
 racket/src/bc/src/list.c                      |  46 ++
 racket/src/bc/src/schminc.h                   |   2 +-
 racket/src/bc/src/startup.inc                 | 115 +--
 racket/src/cs/chezpart.sls                    |   2 -
 racket/src/cs/primitive/kernel.ss             |   2 +
 racket/src/cs/rumble/check.ss                 |   2 +-
 racket/src/cs/rumble/error-rewrite.ss         |   2 +
 racket/src/cs/rumble/foreign.ss               |  12 +-
 racket/src/cs/rumble/object-name.ss           |   2 +-
 racket/src/cs/rumble/struct.ss                |   2 +-
 racket/src/cs/schemified/expander.scm         | 694 ++++++++----------
 racket/src/cs/schemified/io.scm               | 405 ++++------
 racket/src/cs/schemified/schemify.scm         | 299 +++-----
 racket/src/cs/schemified/thread.scm           | 359 ++++-----
 racket/src/version/racket_version.h           |   2 +-
 18 files changed, 822 insertions(+), 1212 deletions(-)

diff --git a/pkgs/base/info.rkt b/pkgs/base/info.rkt
index 2ae324003b..0a29a6f837 100644
--- a/pkgs/base/info.rkt
+++ b/pkgs/base/info.rkt
@@ -14,7 +14,7 @@
 
 ;; In the Racket source repo, this version should change only when
 ;; "racket_version.h" changes:
-(define version "8.0.0.11")
+(define version "8.0.0.12")
 
 (define deps `("racket-lib"
                ["racket" #:version ,version]))
diff --git a/pkgs/racket-test-core/tests/racket/basic.rktl b/pkgs/racket-test-core/tests/racket/basic.rktl
index 99d290beef..c3676f8350 100644
--- a/pkgs/racket-test-core/tests/racket/basic.rktl
+++ b/pkgs/racket-test-core/tests/racket/basic.rktl
@@ -328,8 +328,9 @@
   (if (eq? memq-name 'member)
       (arity-test memq 2 3)
       (arity-test memq 2 2))
-  (err/rt-test (memq 'a 1) exn:application:mismatch?)
-  (err/rt-test (memq 'a '(1 . 2)) exn:application:mismatch?))
+  (err/rt-test (memq 'a 1) exn:fail:contract? #rx"not a proper list")
+  (err/rt-test (memq 'a '(1 . 2)) exn:fail:contract? #rx"not a proper list")
+  (err/rt-test (memq 'a (read (open-input-string "#0=(1 . #0#)"))) exn:fail:contract? #rx"not a proper list"))
 
 (test-mem memq 'memq)
 (test-mem memv 'memv)
diff --git a/racket/collects/racket/private/member.rkt b/racket/collects/racket/private/member.rkt
index 24a2469b07..f811747e60 100644
--- a/racket/collects/racket/private/member.rkt
+++ b/racket/collects/racket/private/member.rkt
@@ -1,57 +1,38 @@
 (module member '#%kernel
-  (#%require "cond.rkt" "qq-and-or.rkt"
-             (for-syntax '#%kernel "qq-and-or.rkt"))
-  (#%provide memq memv member)
+  (#%require "cond.rkt" "qq-and-or.rkt")
+  (#%provide member)
 
-  ;; helper for memq/v/ber error cases
+  ;; helper for member error cases
   (define-values (bad-list)
     (λ (who orig-l)
       (raise-mismatch-error who "not a proper list: " orig-l)))
 
-  (define-values (memq memv member)
-    (let-values ()
-      ;; Create the mem functions
-      (define-syntaxes (mk mk-member)
-        (values
-         (λ (stx)
-           (define-values (forms) (syntax-e stx))
-           (define-values (id eq?)
-             (values (syntax-e (cadr forms))
-                     (syntax-e (caddr forms))))
-           (datum->syntax
-            stx
-            `(let-values ([(,id)
-                           (lambda (v orig-l)
-                             (let loop ([ls orig-l])
-                               (cond
+  (define-values (member)
+    (letrec-values ([(member)
+                     (lambda (v orig-l eql?)
+                       (let loop ([ls orig-l] [turtle orig-l])
+                         (cond
+                           [(null? ls) #f]
+                           [(not (pair? ls))
+                            (bad-list 'member orig-l)]
+                           [(eql? v (car ls)) ls]
+                           [else
+                            (let ([ls (cdr ls)])
+                              (cond
                                 [(null? ls) #f]
-                                [(not (pair? ls))
-                                 (bad-list ',id orig-l)]
-                                [(,eq? v (car ls)) ls]
-                                [else (loop (cdr ls))])))])
-                                 ,id)))
-         ;; Create the `member` function that takes an extra argument
-         ;; Uses `mk` to construct the body
-         (λ (stx)
-           (define-values (forms) (syntax-e stx))
-           (define-values (id) (syntax-e (cadr forms)))
-           (datum->syntax
-            stx
-            `(let* ([default (mk member equal?)]
-                    [,id (case-lambda
-                           ([v orig-l] (default v orig-l))
-                           ([v orig-l eq?]
-                            (if (and (procedure? eq?)
-                                     (procedure-arity-includes? eq? 2))
-                                (void)
-                                (raise-argument-error
-                                 'member
-                                 "(procedure-arity-includes/c 2)"
-                                 eq?))
-                            ((mk member eq?) v orig-l)))])
-               ,id)))))
-      (values (mk memq eq?)
-              (mk memv eqv?)
-              ;; Note that this uses `mk-member`
-              (mk-member member)))))
-
+                                [(or (not (pair? ls))
+                                     (eq? ls turtle))
+                                 (bad-list 'member orig-l)]
+                                [(eql? v (car ls)) ls]
+                                [else (loop (cdr ls) (cdr turtle))]))])))])
+      (case-lambda
+        [(v ls) (member v ls equal?)]
+        [(v ls eql?)
+         (if (and (procedure? eql?)
+                  (procedure-arity-includes? eql? 2))
+             (void)
+             (raise-argument-error
+              'member
+              "(procedure-arity-includes/c 2)"
+              eq?))
+         (member v ls eql?)]))))
diff --git a/racket/src/bc/src/list.c b/racket/src/bc/src/list.c
index d2ded95b86..41272d874b 100644
--- a/racket/src/bc/src/list.c
+++ b/racket/src/bc/src/list.c
@@ -50,6 +50,8 @@ static Scheme_Object *immutablep (int argc, Scheme_Object *argv[]);
 static Scheme_Object *length_prim (int argc, Scheme_Object *argv[]);
 static Scheme_Object *append_prim (int argc, Scheme_Object *argv[]);
 static Scheme_Object *reverse_prim (int argc, Scheme_Object *argv[]);
+static Scheme_Object *memv (int argc, Scheme_Object *argv[]);
+static Scheme_Object *memq (int argc, Scheme_Object *argv[]);
 static Scheme_Object *assv (int argc, Scheme_Object *argv[]);
 static Scheme_Object *assq (int argc, Scheme_Object *argv[]);
 static Scheme_Object *assoc (int argc, Scheme_Object *argv[]);
@@ -345,6 +347,17 @@ scheme_init_list (Scheme_Startup_Env *env)
                                                             | SCHEME_PRIM_AD_HOC_OPT);
   scheme_addto_prim_instance ("list-ref",p, env);
 
+  scheme_addto_prim_instance ("memq",
+			      scheme_make_immed_prim(memq,
+						     "memq",
+						     2, 2),
+			      env);
+  scheme_addto_prim_instance ("memv",
+			      scheme_make_immed_prim(memv,
+						     "memv",
+						     2, 2),
+			      env);
+
   scheme_addto_prim_instance ("assq",
 			      scheme_make_immed_prim(assq,
 						     "assq",
@@ -1735,6 +1748,39 @@ static void mem_past_end(const char *name, Scheme_Object *s_arg, Scheme_Object *
                         NULL);
 }
 
+#define GEN_MEM(name, scheme_name, comp)                \
+  static Scheme_Object *                                \
+  name (int argc, Scheme_Object *argv[])                \
+  {                                                     \
+    Scheme_Object *list, *turtle;                       \
+    list = turtle = argv[1];                            \
+    while (SCHEME_PAIRP(list))                          \
+      {                                                 \
+        if (comp (argv[0], SCHEME_CAR (list)))          \
+          {                                             \
+            return list;                                \
+          }                                             \
+        list = SCHEME_CDR (list);                       \
+        if (SCHEME_PAIRP(list)) {                       \
+          if (comp (argv[0], SCHEME_CAR (list)))        \
+            {                                           \
+              return list;                              \
+            }                                           \
+          if (SAME_OBJ(list, turtle)) break;            \
+          list = SCHEME_CDR (list);                     \
+          turtle = SCHEME_CDR (turtle);                 \
+          SCHEME_USE_FUEL(1);                           \
+        }                                               \
+      }                                                 \
+    if (!SCHEME_NULLP(list)) {                          \
+      mem_past_end(#scheme_name, argv[0], argv[1]);     \
+    }                                                   \
+    return (scheme_false);                              \
+  }
+
+GEN_MEM(memv, memv, scheme_eqv)
+GEN_MEM(memq, memq, SAME_OBJ)
+
 static void ass_non_pair(const char *name, Scheme_Object *np, Scheme_Object *s_arg, Scheme_Object *arg)
 {
   scheme_contract_error(name,
diff --git a/racket/src/bc/src/schminc.h b/racket/src/bc/src/schminc.h
index 935f174b70..dc3a6b0355 100644
--- a/racket/src/bc/src/schminc.h
+++ b/racket/src/bc/src/schminc.h
@@ -15,7 +15,7 @@
 
 #define USE_COMPILED_STARTUP 1
 
-#define EXPECTED_PRIM_COUNT 1501
+#define EXPECTED_PRIM_COUNT 1503
 
 #ifdef MZSCHEME_SOMETHING_OMITTED
 # undef USE_COMPILED_STARTUP
diff --git a/racket/src/bc/src/startup.inc b/racket/src/bc/src/startup.inc
index 09fd856183..1b6ea52dc6 100644
--- a/racket/src/bc/src/startup.inc
+++ b/racket/src/bc/src/startup.inc
@@ -77,94 +77,43 @@ static const char *startup_source =
 "(bad-list$1)"
 "  (lambda (who_0 orig-l_0) (begin 'bad-list (raise-mismatch-error who_0 \"not a proper list: \" orig-l_0))))"
 "(define-values"
-"(memq memv member)"
-"(let-values()"
-"(let-values()"
-"(values"
-"(let-values(((memq_0)"
-"(lambda(v_0 orig-l_0)"
-"(begin"
-" 'memq"
-"((letrec-values(((loop_0)"
-"(lambda(ls_0)"
-"(begin"
-" 'loop"
-"(if(null? ls_0)"
-"(let-values() #f)"
-"(if(not(pair? ls_0))"
-"(let-values()(bad-list$1 'memq orig-l_0))"
-"(if(eq? v_0(car ls_0))"
-"(let-values() ls_0)"
-"(let-values()(loop_0(cdr ls_0))))))))))"
-" loop_0)"
-" orig-l_0)))))"
-" memq_0)"
-"(let-values(((memv_0)"
-"(lambda(v_0 orig-l_0)"
-"(begin"
-" 'memv"
-"((letrec-values(((loop_0)"
-"(lambda(ls_0)"
-"(begin"
-" 'loop"
-"(if(null? ls_0)"
-"(let-values() #f)"
-"(if(not(pair? ls_0))"
-"(let-values()(bad-list$1 'memv orig-l_0))"
-"(if(eqv? v_0(car ls_0))"
-"(let-values() ls_0)"
-"(let-values()(loop_0(cdr ls_0))))))))))"
-" loop_0)"
-" orig-l_0)))))"
-" memv_0)"
-"(let-values(((default_0)"
-"(let-values(((member_0)"
-"(lambda(v_0 orig-l_0)"
+"(member)"
+"(letrec-values(((member_0)"
+"(lambda(v_0 orig-l_0 eql?_0)"
 "(begin"
 " 'member"
 "((letrec-values(((loop_0)"
-"(lambda(ls_0)"
+"(lambda(ls_0 turtle_0)"
 "(begin"
 " 'loop"
 "(if(null? ls_0)"
 "(let-values() #f)"
 "(if(not(pair? ls_0))"
 "(let-values()(bad-list$1 'member orig-l_0))"
-"(if(equal? v_0(car ls_0))"
+"(if(eql?_0 v_0(car ls_0))"
 "(let-values() ls_0)"
-"(let-values()(loop_0(cdr ls_0))))))))))"
-" loop_0)"
-" orig-l_0)))))"
-" member_0)))"
-"(let-values(((member_0)"
-"(case-lambda"
-"((v_0 orig-l_0)(begin 'member(default_0 v_0 orig-l_0)))"
-"((v_0 orig-l_0 eq?_0)"
-"(begin"
-"(if(if(procedure? eq?_0)(procedure-arity-includes? eq?_0 2) #f)"
-"(void)"
-"                             (raise-argument-error 'member \"(procedure-arity-includes/c 2)\" eq?_0))"
-"((let-values(((member_0)"
-"(lambda(v_1 orig-l_1)"
-"(begin"
-" 'member"
-"((letrec-values(((loop_0)"
-"(lambda(ls_0)"
-"(begin"
-" 'loop"
-"(if(null? ls_0)"
+"(let-values()"
+"(let-values(((ls_1)(cdr ls_0)))"
+"(if(null? ls_1)"
 "(let-values() #f)"
-"(if(not(pair? ls_0))"
-"(let-values()(bad-list$1 'member orig-l_1))"
-"(if(eq?_0 v_1(car ls_0))"
-"(let-values() ls_0)"
-"(let-values()(loop_0(cdr ls_0))))))))))"
+"(if(let-values(((or-part_0)(not(pair? ls_1))))"
+"(if or-part_0 or-part_0(eq? ls_1 turtle_0)))"
+"(let-values()(bad-list$1 'member orig-l_0))"
+"(if(eql?_0 v_0(car ls_1))"
+"(let-values() ls_1)"
+"(let-values()"
+"(loop_0(cdr ls_1)(cdr turtle_0)))))))))))))))"
 " loop_0)"
-" orig-l_1)))))"
-" member_0)"
-" v_0"
-" orig-l_0))))))"
-" member_0))))))"
+" orig-l_0"
+" orig-l_0)))))"
+"(case-lambda"
+"((v_0 ls_0)(begin(member_0 v_0 ls_0 equal?)))"
+"((v_0 ls_0 eql?_0)"
+"(begin"
+"(if(if(procedure? eql?_0)(procedure-arity-includes? eql?_0 2) #f)"
+"(void)"
+"          (raise-argument-error 'member \"(procedure-arity-includes/c 2)\" eq?))"
+"(member_0 v_0 ls_0 eql?_0))))))"
 "(define-values(current-parameterization)(lambda()(begin(continuation-mark-set-first #f parameterization-key))))"
 "(define-values"
 "(call-with-parameterization)"
@@ -556,6 +505,15 @@ static const char *startup_source =
 "(if(let-values(((or-part_0)(bytes? s_0)))(if or-part_0 or-part_0(string? s_0)))"
 "(void)"
 "          (let-values () (raise-argument-error 'path-list-string->path-list \"(or/c bytes? string?)\" s_0)))"
+"        (if (regexp-match? '#rx#\"\\0\" s_0)"
+"(let-values()"
+"            (let-values (((label_0) (if (bytes? s_0) \"byte string\" \"string\")))"
+"(raise-arguments-error"
+" 'path-list-string->path-list"
+"               (format \"given ~a contains a nul character\" label_0)"
+" label_0"
+" s_0)))"
+"(void))"
 "(if(if(list? default_0)"
 "(andmap"
 "(lambda(p_0)(let-values(((or-part_0)(eq? p_0 'same)))(if or-part_0 or-part_0 path?)))"
@@ -620,7 +578,7 @@ static const char *startup_source =
 "(if(if(relative-path? program_0)"
 "(let-values(((base_0 name_0 dir?_0)(split-path program_0)))(eq? base_0 'relative))"
 " #f)"
-"            (let-values (((paths-str_0) (environment-variables-ref (current-environment-variables) #\"PATH\"))"
+"            (let-values (((paths-bstr_0) (environment-variables-ref (current-environment-variables) #\"PATH\"))"
 "((win-add_0)"
 "(lambda(s_0)"
 "                            (begin 'win-add (if (eq? (system-type) 'windows) (cons (bytes->path #\".\") s_0) s_0)))))"
@@ -634,8 +592,7 @@ static const char *startup_source =
 "(let-values(((name_0)(build-path base_0 program_0)))"
 "(if(file-exists? name_0)(found-exec_0 name_0)(loop_0(cdr paths_0))))))))))"
 " loop_0)"
-"(win-add_0"
-"(if paths-str_0(path-list-string->path-list(bytes->string/locale paths-str_0 '#\\?) null) null))))"
+"(win-add_0(if paths-bstr_0(path-list-string->path-list paths-bstr_0 null) null))))"
 "(let-values(((p_0)(path->complete-path program_0)))(if(file-exists? p_0)(found-exec_0 p_0) #f)))))))"
 "((program_0 libpath_0)(find-executable-path program_0 libpath_0 #f))"
 "((program_0)(find-executable-path program_0 #f #f))))"
diff --git a/racket/src/cs/chezpart.sls b/racket/src/cs/chezpart.sls
index a17edb98fb..2d65ca5910 100644
--- a/racket/src/cs/chezpart.sls
+++ b/racket/src/cs/chezpart.sls
@@ -78,8 +78,6 @@
                    [delete-directory chez:delete-directory]
                    [filter chez:filter]
                    [member chez:member]
-                   [memv chez:memv]
-                   [memq chez:memq]
                    [error chez:error]
                    [raise chez:raise]
                    [exit-handler chez:exit-handler]
diff --git a/racket/src/cs/primitive/kernel.ss b/racket/src/cs/primitive/kernel.ss
index cc4506c721..70a619065a 100644
--- a/racket/src/cs/primitive/kernel.ss
+++ b/racket/src/cs/primitive/kernel.ss
@@ -559,6 +559,8 @@
   [mcons (known-procedure/allocates 4)]
   [memory-order-acquire (known-procedure/single-valued 1)]
   [memory-order-release (known-procedure/single-valued 1)]
+  [memq (known-procedure/single-valued 4)]
+  [memv (known-procedure/single-valued 4)]
   [min (known-procedure/folding -2)]
   [modulo (known-procedure/folding 4)]
   [mpair? (known-procedure/pure/folding 2)]
diff --git a/racket/src/cs/rumble/check.ss b/racket/src/cs/rumble/check.ss
index 4310739ec5..d5f491ad24 100644
--- a/racket/src/cs/rumble/check.ss
+++ b/racket/src/cs/rumble/check.ss
@@ -59,7 +59,7 @@
   (check who
          :test (and (pair? errno)
                     (exact-integer? (car errno))
-                    (chez:memq (cdr errno) '(posix windows gai)))
+                    (#%memq (cdr errno) '(posix windows gai)))
          :contract "(cons/c exact-integer? (or/c 'posix 'windows 'gai))"
          errno))
 
diff --git a/racket/src/cs/rumble/error-rewrite.ss b/racket/src/cs/rumble/error-rewrite.ss
index 787950e36d..0822213764 100644
--- a/racket/src/cs/rumble/error-rewrite.ss
+++ b/racket/src/cs/rumble/error-rewrite.ss
@@ -110,6 +110,8 @@
                            "  index: ~s\n"
                            "  in: ~s")
             irritants)]
+   [(or (eq? who 'memq) (eq? who 'memv))
+    (values "not a proper list: ~s" irritants)]
    [(equal? str  "~s is not a valid index for ~s")
     (cond
      [(exact-nonnegative-integer? (car irritants))
diff --git a/racket/src/cs/rumble/foreign.ss b/racket/src/cs/rumble/foreign.ss
index 9e6ba98e7e..b17d3747a8 100644
--- a/racket/src/cs/rumble/foreign.ss
+++ b/racket/src/cs/rumble/foreign.ss
@@ -24,7 +24,7 @@
                                    (raise-arguments-error 'prop:cpointer
                                                           "index is out of range"
                                                           "index" v))
-                                 (unless (chez:memv v (list-ref info 5))
+                                 (unless (#%memv v (list-ref info 5))
                                    (raise-arguments-error 'prop:cpointer
                                                           "index does not refer to an immutable field"
                                                           "index" v))
@@ -1485,9 +1485,9 @@
   (make-cpointer/cell (addr->vector a) #f))
 
 (define (malloc-mode? v)
-  (chez:memq v '(raw atomic nonatomic tagged
-                     atomic-interior interior
-                     stubborn uncollectable eternal)))
+  (#%memq v '(raw atomic nonatomic tagged
+                  atomic-interior interior
+                  stubborn uncollectable eternal)))
 
 (define (end-stubborn-change p)
   (raise-unsupported-error 'end-stubborn-change))
@@ -1609,7 +1609,7 @@
                       ;; An 'array rep is compound, but should be
                       ;; passed as a pointer, so only pass 'struct and
                       ;; 'union "by value":
-                      (chez:memq (ctype-host-rep type) '(struct union)))]
+                      (#%memq (ctype-host-rep type) '(struct union)))]
          [array-rep-to-pointer-rep (lambda (host-rep)
                                      (if (eq? host-rep 'array)
                                          'void*
@@ -2120,7 +2120,7 @@
 ;; function is called with interrupts disabled
 (define get-errno
   (cond
-   [(not (chez:memq (machine-type) '(a6nt ta6nt i3nt ti3nt)))
+   [(not (#%memq (machine-type) '(a6nt ta6nt i3nt ti3nt)))
     (foreign-procedure "(cs)s_errno" () int)]
    [else
     ;; On Windows, `errno` could be a different one from
diff --git a/racket/src/cs/rumble/object-name.ss b/racket/src/cs/rumble/object-name.ss
index 0357c1ca36..587807b9bc 100644
--- a/racket/src/cs/rumble/object-name.ss
+++ b/racket/src/cs/rumble/object-name.ss
@@ -9,7 +9,7 @@
                                                           "field index >= initialized-field count for structure type"
                                                           "field index" v
                                                           "initialized-field count" (list-ref info 1)))
-                                 (unless (chez:memv v (list-ref info 5))
+                                 (unless (#%memv v (list-ref info 5))
                                    (raise-arguments-error 'guard-for-prop:object-name "field index not declared immutable"
                                                           "field index" v))
                                  (+ v (let ([p (list-ref info 6)])
diff --git a/racket/src/cs/rumble/struct.ss b/racket/src/cs/rumble/struct.ss
index c476a6b3f4..2b277c1d59 100644
--- a/racket/src/cs/rumble/struct.ss
+++ b/racket/src/cs/rumble/struct.ss
@@ -329,7 +329,7 @@
                                            "index for procedure >= initialized-field count"
                                            "index" v
                                            "field count" init-count))
-                  (unless (or (eq? v proc-spec) (chez:memv v immutables))
+                  (unless (or (eq? v proc-spec) (#%memv v immutables))
                     (raise-arguments-error who
                                            "field is not specified as immutable for a prop:procedure index"
                                            "index" v))]
diff --git a/racket/src/cs/schemified/expander.scm b/racket/src/cs/schemified/expander.scm
index afacfad02d..f0955f711d 100644
--- a/racket/src/cs/schemified/expander.scm
+++ b/racket/src/cs/schemified/expander.scm
@@ -472,108 +472,52 @@
    bad-list
    (lambda (who_0 orig-l_0)
      (begin (raise-mismatch-error who_0 "not a proper list: " orig-l_0)))))
-(define memq
-  (|#%name|
-   memq
-   (lambda (v_0 orig-l_0)
-     (begin
-       (letrec*
-        ((loop_0
-          (|#%name|
-           loop
-           (lambda (ls_0)
-             (begin
-               (if (null? ls_0)
-                 #f
-                 (if (not (pair? ls_0))
-                   (begin-unsafe
-                    (raise-mismatch-error
-                     'memq
-                     "not a proper list: "
-                     orig-l_0))
-                   (if (eq? v_0 (car ls_0)) ls_0 (loop_0 (cdr ls_0))))))))))
-        (loop_0 orig-l_0))))))
-(define memv
-  (|#%name|
-   memv
-   (lambda (v_0 orig-l_0)
-     (begin
-       (letrec*
-        ((loop_0
-          (|#%name|
-           loop
-           (lambda (ls_0)
-             (begin
-               (if (null? ls_0)
-                 #f
-                 (if (not (pair? ls_0))
-                   (begin-unsafe
-                    (raise-mismatch-error
-                     'memv
-                     "not a proper list: "
-                     orig-l_0))
-                   (if (eqv? v_0 (car ls_0)) ls_0 (loop_0 (cdr ls_0))))))))))
-        (loop_0 orig-l_0))))))
 (define member
-  (let ((default_0
-         (|#%name|
-          member
-          (lambda (v_0 orig-l_0)
-            (begin
-              (letrec*
-               ((loop_0
-                 (|#%name|
-                  loop
-                  (lambda (ls_0)
-                    (begin
-                      (if (null? ls_0)
-                        #f
-                        (if (not (pair? ls_0))
-                          (begin-unsafe
-                           (raise-mismatch-error
-                            'member
-                            "not a proper list: "
-                            orig-l_0))
-                          (if (equal? v_0 (car ls_0))
-                            ls_0
-                            (loop_0 (cdr ls_0))))))))))
-               (loop_0 orig-l_0)))))))
-    (|#%name|
-     member
-     (case-lambda
-      ((v_0 orig-l_0) (begin (default_0 v_0 orig-l_0)))
-      ((v_0 orig-l_0 eq?_0)
-       (begin
-         (if (if (procedure? eq?_0) (procedure-arity-includes? eq?_0 2) #f)
-           (void)
-           (raise-argument-error
-            'member
-            "(procedure-arity-includes/c 2)"
-            eq?_0))
-         ((|#%name|
-           member
-           (lambda (v_1 orig-l_1)
-             (begin
-               (letrec*
-                ((loop_0
-                  (|#%name|
-                   loop
-                   (lambda (ls_0)
-                     (begin
-                       (if (null? ls_0)
-                         #f
-                         (if (not (pair? ls_0))
-                           (begin-unsafe
-                            (raise-mismatch-error
-                             'member
-                             "not a proper list: "
-                             orig-l_1))
-                           (if (|#%app| eq?_0 v_1 (car ls_0))
-                             ls_0
-                             (loop_0 (cdr ls_0))))))))))
-                (loop_0 orig-l_1)))))
-          v_0
-          orig-l_0)))))))
+  (letrec*
+   ((member_0
+     (|#%name|
+      member
+      (lambda (v_0 orig-l_0 eql?_0)
+        (begin
+          (letrec*
+           ((loop_0
+             (|#%name|
+              loop
+              (lambda (ls_0 turtle_0)
+                (begin
+                  (if (null? ls_0)
+                    #f
+                    (if (not (pair? ls_0))
+                      (begin-unsafe
+                       (raise-mismatch-error
+                        'member
+                        "not a proper list: "
+                        orig-l_0))
+                      (if (|#%app| eql?_0 v_0 (car ls_0))
+                        ls_0
+                        (let ((ls_1 (cdr ls_0)))
+                          (if (null? ls_1)
+                            #f
+                            (if (let ((or-part_0 (not (pair? ls_1))))
+                                  (if or-part_0 or-part_0 (eq? ls_1 turtle_0)))
+                              (begin-unsafe
+                               (raise-mismatch-error
+                                'member
+                                "not a proper list: "
+                                orig-l_0))
+                              (if (|#%app| eql?_0 v_0 (car ls_1))
+                                ls_1
+                                (let ((app_0 (cdr ls_1)))
+                                  (loop_0 app_0 (cdr turtle_0)))))))))))))))
+           (loop_0 orig-l_0 orig-l_0)))))))
+   (case-lambda
+    ((v_0 ls_0) (member_0 v_0 ls_0 equal?))
+    ((v_0 ls_0 eql?_0)
+     (begin
+       (if (if (procedure? eql?_0) (procedure-arity-includes? eql?_0 2) #f)
+         (void)
+         (raise-argument-error 'member "(procedure-arity-includes/c 2)" eq?))
+       (member_0 v_0 ls_0 eql?_0))))))
 (define current-parameterization
   (lambda () (continuation-mark-set-first #f parameterization-key)))
 (define call-with-parameterization
@@ -3936,7 +3880,7 @@
 (define cell.2$4 (unsafe-make-place-local (make-hasheq)))
 (define performance-place-init!
   (lambda () (unsafe-place-local-set! cell.2$4 (make-hasheq))))
-(define finish104
+(define finish101
   (make-struct-type-install-properties
    '(region)
    5
@@ -3957,7 +3901,7 @@
    #f
    5
    30))
-(define effect_2980 (finish104 struct:region))
+(define effect_2980 (finish101 struct:region))
 (define region1.1
   (|#%name|
    region
@@ -4118,7 +4062,7 @@
          v
          'region
          'as-nested-memory))))))
-(define finish116
+(define finish113
   (make-struct-type-install-properties
    '(stat)
    3
@@ -4139,7 +4083,7 @@
    #f
    3
    7))
-(define effect_2500 (finish116 struct:stat))
+(define effect_2500 (finish113 struct:stat))
 (define stat2.1
   (|#%name|
    stat
@@ -5419,7 +5363,7 @@
             (for-loop_0 0 start_0))))
         #f)
       #f)))
-(define finish154
+(define finish151
   (make-struct-type-install-properties
    '(weak-intern-table)
    1
@@ -5440,7 +5384,7 @@
    #f
    1
    0))
-(define effect_2507 (finish154 struct:weak-intern-table))
+(define effect_2507 (finish151 struct:weak-intern-table))
 (define weak-intern-table1.1
   (|#%name|
    weak-intern-table
@@ -5452,7 +5396,7 @@
   (|#%name|
    weak-intern-table-box
    (record-accessor struct:weak-intern-table 0)))
-(define finish156
+(define finish153
   (make-struct-type-install-properties
    '(table)
    3
@@ -5473,7 +5417,7 @@
    #f
    3
    0))
-(define effect_2522 (finish156 struct:table))
+(define effect_2522 (finish153 struct:table))
 (define table2.1
   (|#%name|
    table
@@ -5653,7 +5597,7 @@
                            result_0))))))
                   (for-loop_0 0 (hash-iterate-first new-ht_0))))))
           (table2.1 new-ht_0 count_0 (max 128 (* 2 count_0))))))))
-(define finish160
+(define finish157
   (make-struct-type-install-properties
    '(resolved-module-path)
    1
@@ -5703,7 +5647,7 @@
    #f
    1
    0))
-(define effect_2442 (finish160 struct:resolved-module-path))
+(define effect_2442 (finish157 struct:resolved-module-path))
 (define resolved-module-path1.1
   (|#%name|
    resolved-module-path
@@ -5834,7 +5778,7 @@
           (if (pair? name_0)
             (list* 'submod root-mod-path_0 (cdr name_0))
             root-mod-path_0))))))
-(define finish163
+(define finish160
   (make-struct-type-install-properties
    '(module-path-index)
    4
@@ -5967,7 +5911,7 @@
    #f
    4
    12))
-(define effect_2892 (finish163 struct:module-path-index))
+(define effect_2892 (finish160 struct:module-path-index))
 (define module-path-index2.1
   (|#%name|
    module-path-index
@@ -6529,7 +6473,7 @@
          (if (pair? default-name_0)
            (cons root-name_0 (cdr default-name_0))
            root-name_0))))))
-(define finish175
+(define finish172
   (make-struct-type-install-properties
    '(promise)
    2
@@ -6550,7 +6494,7 @@
    #f
    2
    3))
-(define effect_2268 (finish175 struct:promise))
+(define effect_2268 (finish172 struct:promise))
 (define promise1.1
   (|#%name|
    promise
@@ -6596,7 +6540,7 @@
   (lambda (small-ht_0 key_0 val_0)
     (set-box! small-ht_0 (hash-set (unbox small-ht_0) key_0 val_0))))
 (define small-hash-keys (lambda (small-ht_0) (hash-keys (unbox small-ht_0))))
-(define finish177
+(define finish174
   (make-struct-type-install-properties
    '(serialize-state)
    12
@@ -6617,7 +6561,7 @@
    #f
    12
    0))
-(define effect_2707 (finish177 struct:serialize-state))
+(define effect_2707 (finish174 struct:serialize-state))
 (define serialize-state1.1
   (|#%name|
    serialize-state
@@ -7217,7 +7161,7 @@
                     (if (hash? d_0)
                       (if (immutable? d_0) (positive? (hash-count d_0)) #f)
                       #f)))))))))))
-(define finish192
+(define finish189
   (make-struct-type-install-properties
    '(preserved-property-value)
    1
@@ -7238,7 +7182,7 @@
    #f
    1
    0))
-(define effect_2588 (finish192 struct:preserved-property-value))
+(define effect_2588 (finish189 struct:preserved-property-value))
 (define preserved-property-value1.1
   (|#%name|
    preserved-property-value
@@ -7430,7 +7374,7 @@
   (make-parameter (seteq) #f 'current-arm-inspectors))
 (define deserialize-tamper
   (lambda (t_0) (if (eq? t_0 'armed) (current-arm-inspectors) t_0)))
-(define finish200
+(define finish197
   (make-struct-type-install-properties
    '(modified-content)
    2
@@ -7451,7 +7395,7 @@
    #f
    2
    0))
-(define effect_2176 (finish200 struct:modified-content))
+(define effect_2176 (finish197 struct:modified-content))
 (define modified-content1.1
   (|#%name|
    modified-content
@@ -7467,7 +7411,7 @@
   (|#%name|
    modified-content-scope-propagations+tamper
    (record-accessor struct:modified-content 1)))
-(define finish202
+(define finish199
   (make-struct-type-install-properties
    '(syntax)
    7
@@ -7709,7 +7653,7 @@
    #f
    7
    1))
-(define effect_2447 (finish202 struct:syntax))
+(define effect_2447 (finish199 struct:syntax))
 (define syntax2.1
   (|#%name|
    syntax
@@ -8056,7 +8000,7 @@
       s_0))))
 (define syntax-place-init!
   (lambda () (unsafe-place-local-set! cell.1$7 (make-weak-hasheq))))
-(define finish228
+(define finish225
   (make-struct-type-install-properties
    '(syntax-state)
    3
@@ -8077,7 +8021,7 @@
    #f
    3
    1))
-(define effect_2710 (finish228 struct:syntax-state))
+(define effect_2710 (finish225 struct:syntax-state))
 (define syntax-state17.1
   (|#%name|
    syntax-state
@@ -8182,7 +8126,7 @@
             #f
             inspector_0)))
       (datum->syntax$1 s_0 content_0 s_0 s_0))))
-(define finish234
+(define finish231
   (make-struct-type-install-properties
    '(full-binding)
    2
@@ -8205,7 +8149,7 @@
    #f
    2
    0))
-(define effect_2734 (finish234 struct:full-binding))
+(define effect_2734 (finish231 struct:full-binding))
 (define full-binding1.1
   (|#%name|
    full-binding
@@ -8358,7 +8302,7 @@
   (lambda (b_0)
     (let ((or-part_0 (simple-module-binding? b_0)))
       (if or-part_0 or-part_0 (full-module-binding? b_0)))))
-(define finish236
+(define finish233
   (make-struct-type-install-properties
    '(full-module-binding)
    9
@@ -8419,7 +8363,7 @@
    #f
    9
    0))
-(define effect_2481 (finish236 struct:full-module-binding))
+(define effect_2481 (finish233 struct:full-module-binding))
 (define full-module-binding45.1
   (|#%name|
    full-module-binding
@@ -8465,7 +8409,7 @@
   (|#%name|
    full-module-binding-extra-nominal-bindings
    (record-accessor struct:full-module-binding 8)))
-(define finish238
+(define finish235
   (make-struct-type-install-properties
    '(simple-module-binding)
    4
@@ -8496,7 +8440,7 @@
    #f
    4
    0))
-(define effect_2891 (finish238 struct:simple-module-binding))
+(define effect_2891 (finish235 struct:simple-module-binding))
 (define simple-module-binding46.1
   (|#%name|
    simple-module-binding
@@ -8594,7 +8538,7 @@
       null
       (full-module-binding-extra-nominal-bindings b_0))))
 (define empty-binding-table hash2610)
-(define finish240
+(define finish237
   (make-struct-type-install-properties
    '(table-with-bulk-bindings)
    3
@@ -8625,7 +8569,7 @@
    #f
    3
    0))
-(define effect_2950 (finish240 struct:table-with-bulk-bindings))
+(define effect_2950 (finish237 struct:table-with-bulk-bindings))
 (define table-with-bulk-bindings1.1
   (|#%name|
    table-with-bulk-bindings
@@ -8653,7 +8597,7 @@
 (define deserialize-table-with-bulk-bindings
   (lambda (syms_0 bulk-bindings_0)
     (table-with-bulk-bindings1.1 syms_0 syms_0 bulk-bindings_0)))
-(define finish242
+(define finish239
   (make-struct-type-install-properties
    '(bulk-binding-at)
    2
@@ -8685,7 +8629,7 @@
    #f
    2
    0))
-(define effect_2253 (finish242 struct:bulk-binding-at))
+(define effect_2253 (finish239 struct:bulk-binding-at))
 (define bulk-binding-at2.1
   (|#%name|
    bulk-binding-at
@@ -8702,7 +8646,7 @@
 (define-values
  (prop:bulk-binding bulk-binding?$1 bulk-binding-ref)
  (make-struct-type-property 'bulk-binding))
-(define finish245
+(define finish242
   (make-struct-type-install-properties
    '(bulk-binding-class)
    2
@@ -8723,7 +8667,7 @@
    #f
    2
    0))
-(define effect_2841 (finish245 struct:bulk-binding-class))
+(define effect_2841 (finish242 struct:bulk-binding-class))
 (define bulk-binding-class3.1
   (|#%name|
    bulk-binding-class
@@ -10198,7 +10142,7 @@
   (lambda (sup-i_0 i_0)
     (let ((or-part_0 (eq? sup-i_0 i_0)))
       (if or-part_0 or-part_0 (inspector-superior? sup-i_0 i_0)))))
-(define finish298
+(define finish295
   (make-struct-type-install-properties
    '(fallback)
    1
@@ -10219,7 +10163,7 @@
    #f
    1
    1))
-(define effect_2114 (finish298 struct:fallback))
+(define effect_2114 (finish295 struct:fallback))
 (define fallback1.1
   (|#%name|
    fallback
@@ -10320,7 +10264,7 @@
       (begin
         (if c_0 (hash-clear! c_0) (void))
         (unsafe-set-box*! (unsafe-place-local-ref cell.2$3) #f))))))
-(define finish302
+(define finish299
   (make-struct-type-install-properties
    '(entry)
    4
@@ -10341,7 +10285,7 @@
    #f
    4
    0))
-(define effect_2728 (finish302 struct:entry))
+(define effect_2728 (finish299 struct:entry))
 (define entry1.1
   (|#%name|
    entry
@@ -10382,7 +10326,7 @@
 (define SHIFTED-CACHE-SIZE 16)
 (define cell.2$3 (unsafe-make-place-local (box #f)))
 (define cell.3$1 (unsafe-make-place-local 0))
-(define finish304
+(define finish301
   (make-struct-type-install-properties
    '(shifted-entry)
    3
@@ -10403,7 +10347,7 @@
    #f
    3
    0))
-(define effect_2358 (finish304 struct:shifted-entry))
+(define effect_2358 (finish301 struct:shifted-entry))
 (define shifted-entry2.1
   (|#%name|
    shifted-entry
@@ -10592,7 +10536,7 @@
             s_0))))))
 (define cache-place-init!
   (lambda () (begin (resolve-cache-place-init!) (sets-place-init!))))
-(define finish306
+(define finish303
   (make-struct-type-install-properties
    '(scope)
    3
@@ -10657,7 +10601,7 @@
    #f
    3
    4))
-(define effect_2269 (finish306 struct:scope))
+(define effect_2269 (finish303 struct:scope))
 (define scope1.1
   (|#%name|
    scope
@@ -10677,7 +10621,7 @@
     (scope1.1 (new-deserialize-scope-id!) kind_0 empty-binding-table))))
 (define deserialize-scope-fill!
   (lambda (s_0 bt_0) (set-scope-binding-table! s_0 bt_0)))
-(define finish310
+(define finish307
   (make-struct-type-install-properties
    '(interned-scope)
    1
@@ -10720,7 +10664,7 @@
    #f
    1
    0))
-(define effect_2498 (finish310 struct:interned-scope))
+(define effect_2498 (finish307 struct:interned-scope))
 (define interned-scope2.1
   (|#%name|
    interned-scope
@@ -10730,7 +10674,7 @@
   (|#%name| interned-scope? (record-predicate struct:interned-scope)))
 (define interned-scope-key
   (|#%name| interned-scope-key (record-accessor struct:interned-scope 0)))
-(define finish314
+(define finish311
   (make-struct-type-install-properties
    '(multi-scope)
    5
@@ -10854,7 +10798,7 @@
    #f
    5
    0))
-(define effect_1895 (finish314 struct:multi-scope))
+(define effect_1895 (finish311 struct:multi-scope))
 (define multi-scope3.1
   (|#%name|
    multi-scope
@@ -10878,7 +10822,7 @@
       (let ((app_1 (box scopes_0)))
         (let ((app_2 (box (hasheqv))))
           (multi-scope3.1 app_0 name_0 app_1 app_2 (box (hash))))))))
-(define finish321
+(define finish318
   (make-struct-type-install-properties
    '(representative-scope)
    2
@@ -10936,7 +10880,7 @@
    #f
    2
    3))
-(define effect_2683 (finish321 struct:representative-scope))
+(define effect_2683 (finish318 struct:representative-scope))
 (define representative-scope4.1
   (|#%name|
    representative-scope
@@ -10977,7 +10921,7 @@
     (begin
       (begin-unsafe (set-scope-binding-table! s_0 bt_0))
       (set-representative-scope-owner! s_0 owner_0))))
-(define finish325
+(define finish322
   (make-struct-type-install-properties
    '(shifted-multi-scope)
    2
@@ -11022,7 +10966,7 @@
    #f
    2
    0))
-(define effect_2854 (finish325 struct:shifted-multi-scope))
+(define effect_2854 (finish322 struct:shifted-multi-scope))
 (define shifted-multi-scope5.1
   (|#%name|
    shifted-multi-scope
@@ -11086,7 +11030,7 @@
             (multi-scope-label-shifted multi-scope_0)
             phase_0
             (lambda () (shifted-multi-scope5.1 phase_0 multi-scope_0)))))))))
-(define finish328
+(define finish325
   (make-struct-type-install-properties
    '(shifted-to-label-phase)
    1
@@ -11107,7 +11051,7 @@
    #f
    1
    1))
-(define effect_2315 (finish328 struct:shifted-to-label-phase))
+(define effect_2315 (finish325 struct:shifted-to-label-phase))
 (define shifted-to-label-phase6.1
   (|#%name|
    shifted-to-label-phase
@@ -11950,7 +11894,7 @@
                                                 (gf_0 #f s_2)))))))))))))
                            (loop_1 #f s_1 0)))))))))
                (loop_0 s_0)))))))))
-(define finish403
+(define finish400
   (make-struct-type-install-properties
    '(propagation)
    7
@@ -11978,7 +11922,7 @@
    #f
    7
    0))
-(define effect_2326 (finish403 struct:propagation))
+(define effect_2326 (finish400 struct:propagation))
 (define propagation12.1
   (|#%name|
    propagation
@@ -13327,7 +13271,7 @@
   (lambda (b_0)
     (let ((or-part_0 (full-local-binding? b_0)))
       (if or-part_0 or-part_0 (symbol? b_0)))))
-(define finish475
+(define finish472
   (make-struct-type-install-properties
    '(full-local-binding)
    1
@@ -13356,7 +13300,7 @@
    #f
    1
    0))
-(define effect_3011 (finish475 struct:full-local-binding))
+(define effect_3011 (finish472 struct:full-local-binding))
 (define full-local-binding1.1
   (|#%name|
    full-local-binding
@@ -13462,7 +13406,7 @@
                        "given"
                        id_0))
                     id_0)))))))))))
-(define finish478
+(define finish475
   (make-struct-type-install-properties
    '(rename-transformer)
    1
@@ -13483,7 +13427,7 @@
    #f
    1
    0))
-(define effect_2525 (finish478 struct:id-rename-transformer))
+(define effect_2525 (finish475 struct:id-rename-transformer))
 (define id-rename-transformer1.1
   (|#%name|
    id-rename-transformer
@@ -13706,7 +13650,7 @@
          unsafe-undefined
          b_0)
         (error "bad binding for free=id:" b_0)))))
-(define finish497
+(define finish494
   (make-struct-type-install-properties
    '(non-source-shift)
    2
@@ -13727,7 +13671,7 @@
    #f
    2
    3))
-(define effect_3061 (finish497 struct:non-source-shift))
+(define effect_3061 (finish494 struct:non-source-shift))
 (define non-source-shift4.1
   (|#%name|
    non-source-shift
@@ -14254,7 +14198,7 @@
                 (syntax-props the-struct_0)
                 (syntax-inspector the-struct_0)))
              (raise-argument-error 'struct-copy "syntax?" the-struct_0))))))))
-(define finish504
+(define finish501
   (make-struct-type-install-properties
    '(provided)
    3
@@ -14284,7 +14228,7 @@
    #f
    3
    0))
-(define effect_2629 (finish504 struct:provided))
+(define effect_2629 (finish501 struct:provided))
 (define provided1.1
   (|#%name|
    provided
@@ -14338,7 +14282,7 @@
                   unsafe-undefined
                   unsafe-undefined
                   binding_0))))))))))
-(define finish506
+(define finish503
   (make-struct-type-install-properties
    '(bulk-binding)
    8
@@ -14448,7 +14392,7 @@
    #f
    8
    9))
-(define effect_2834 (finish506 struct:bulk-binding))
+(define effect_2834 (finish503 struct:bulk-binding))
 (define bulk-binding12.1
   (|#%name|
    bulk-binding
@@ -14536,7 +14480,7 @@
                   (args (raise-binding-result-arity-error 2 args))))
                 table_0))))))
        (for-loop_0 hash2725 (hash-iterate-first provides_0))))))
-(define finish510
+(define finish507
   (make-struct-type-install-properties
    '(bulk-provide)
    2
@@ -14557,7 +14501,7 @@
    #f
    2
    0))
-(define effect_2392 (finish510 struct:bulk-provide))
+(define effect_2392 (finish507 struct:bulk-provide))
 (define bulk-provide13.1
   (|#%name|
    bulk-provide
@@ -14607,7 +14551,7 @@
          s
          'bulk-provide
          'provides))))))
-(define finish515
+(define finish512
   (make-struct-type-install-properties
    '(bulk-binding-registry)
    1
@@ -14628,7 +14572,7 @@
    #f
    1
    0))
-(define effect_2403 (finish515 struct:bulk-binding-registry))
+(define effect_2403 (finish512 struct:bulk-binding-registry))
 (define bulk-binding-registry14.1
   (|#%name|
    bulk-binding-registry
@@ -14681,7 +14625,7 @@
       #t
       #f)))
 (define generate-lift-key (lambda () (gensym 'lift)))
-(define finish519
+(define finish516
   (make-struct-type-install-properties
    '(root-expand-context)
    4
@@ -14702,7 +14646,7 @@
    #f
    4
    0))
-(define effect_2124 (finish519 struct:root-expand-context/outer))
+(define effect_2124 (finish516 struct:root-expand-context/outer))
 (define root-expand-context/outer1.1
   (|#%name|
    root-expand-context/outer
@@ -14731,7 +14675,7 @@
   (|#%name|
    root-expand-context-frame-id
    (record-accessor struct:root-expand-context/outer 3)))
-(define finish521
+(define finish518
   (make-struct-type-install-properties
    '(root-expand-context/inner)
    7
@@ -14752,7 +14696,7 @@
    #f
    7
    0))
-(define effect_2880 (finish521 struct:root-expand-context/inner))
+(define effect_2880 (finish518 struct:root-expand-context/inner))
 (define root-expand-context/inner2.1
   (|#%name|
    root-expand-context/inner
@@ -15290,7 +15234,7 @@
        (error
         "broken '#%linklet primitive table; maybe you need to use \"bootstrap-run.rkt\"")))
     (void)))
-(define finish559
+(define finish556
   (make-struct-type-install-properties
    '(module-registry)
    2
@@ -15311,7 +15255,7 @@
    #f
    2
    0))
-(define effect_2565 (finish559 struct:module-registry))
+(define effect_2565 (finish556 struct:module-registry))
 (define module-registry1.1
   (|#%name|
    module-registry
@@ -15410,7 +15354,7 @@
                            (if or-part_0 or-part_0 never-evt))))
                       (loop_0))))))))))
        (loop_0)))))
-(define finish569
+(define finish566
   (make-struct-type-install-properties
    '(namespace)
    15
@@ -15456,7 +15400,7 @@
    #f
    15
    4096))
-(define effect_3128 (finish569 struct:namespace))
+(define effect_3128 (finish566 struct:namespace))
 (define namespace1.1
   (|#%name|
    namespace
@@ -15505,7 +15449,7 @@
   (|#%name| namespace-module-instances (record-accessor struct:namespace 14)))
 (define set-namespace-inspector!
   (|#%name| set-namespace-inspector! (record-mutator struct:namespace 12)))
-(define finish573
+(define finish570
   (make-struct-type-install-properties
    '(definitions)
    2
@@ -15526,7 +15470,7 @@
    #f
    2
    0))
-(define effect_2319 (finish573 struct:definitions))
+(define effect_2319 (finish570 struct:definitions))
 (define definitions2.1
   (|#%name|
    definitions
@@ -16036,7 +15980,7 @@
                       (for-loop_0 new-stx_2 rest_0))))
                 new-stx_1))))))
        (for-loop_0 new-stx_0 old-stxes_0)))))
-(define finish617
+(define finish614
   (make-struct-type-install-properties
    '(syntax-binding-set)
    1
@@ -16057,7 +16001,7 @@
    #f
    1
    0))
-(define effect_2582 (finish617 struct:syntax-binding-set))
+(define effect_2582 (finish614 struct:syntax-binding-set))
 (define syntax-binding-set1.1
   (|#%name|
    syntax-binding-set
@@ -16093,7 +16037,7 @@
          s
          'syntax-binding-set
          'binds))))))
-(define finish621
+(define finish618
   (make-struct-type-install-properties
    '(bind)
    3
@@ -16114,7 +16058,7 @@
    #f
    3
    0))
-(define effect_2584 (finish621 struct:bind))
+(define effect_2584 (finish618 struct:bind))
 (define bind2.1
   (|#%name|
    bind
@@ -16565,7 +16509,7 @@
 (define current-previously-unbound (lambda () #f))
 (define set-current-previously-unbound!
   (lambda (proc_0) (set! current-previously-unbound proc_0)))
-(define finish632
+(define finish629
   (make-struct-type-install-properties
    '(module-use)
    2
@@ -16622,7 +16566,7 @@
    #f
    2
    0))
-(define effect_2097 (finish632 struct:module-use))
+(define effect_2097 (finish629 struct:module-use))
 (define module-use1.1
   (|#%name|
    module-use
@@ -16670,7 +16614,7 @@
          s
          'module-use
          'phase))))))
-(define finish640
+(define finish637
   (make-struct-type-install-properties
    '(module)
    20
@@ -16691,7 +16635,7 @@
    #f
    20
    16))
-(define effect_2640 (finish640 struct:module))
+(define effect_2640 (finish637 struct:module))
 (define module1.1
   (|#%name|
    module
@@ -16741,7 +16685,7 @@
   (|#%name| module-get-all-variables (record-accessor struct:module 19)))
 (define set-module-access!
   (|#%name| set-module-access! (record-mutator struct:module 4)))
-(define finish642
+(define finish639
   (make-struct-type-install-properties
    '(module-linklet-info)
    6
@@ -16762,7 +16706,7 @@
    #f
    6
    0))
-(define effect_2508 (finish642 struct:module-linklet-info))
+(define effect_2508 (finish639 struct:module-linklet-info))
 (define module-linklet-info2.1
   (|#%name|
    module-linklet-info
@@ -16854,7 +16798,7 @@
                 submodule-names18_0
                 supermodule-name19_0
                 get-all-variables_0)))))))))
-(define finish645
+(define finish642
   (make-struct-type-install-properties
    '(module-instance)
    7
@@ -16875,7 +16819,7 @@
    #f
    7
    52))
-(define effect_2382 (finish645 struct:module-instance))
+(define effect_2382 (finish642 struct:module-instance))
 (define module-instance40.1
   (|#%name|
    module-instance
@@ -18418,7 +18362,7 @@
                   (lambda (s_0) (error "bad syntax:" s_0)))))
             (lambda (t_0) v_0))))))))
 (define 1/make-set!-transformer
-  (let ((finish745
+  (let ((finish742
          (make-struct-type-install-properties
           '(set!-transformer)
           1
@@ -18432,7 +18376,7 @@
           'set!-transformer)))
     (let ((struct:set!-transformer_0
            (make-record-type-descriptor* 'set!-transformer #f #f #f #f 1 0)))
-      (let ((effect746 (finish745 struct:set!-transformer_0)))
+      (let ((effect743 (finish742 struct:set!-transformer_0)))
         (let ((set!-transformer1_0
                (|#%name|
                 set!-transformer
@@ -18505,7 +18449,7 @@
   (lambda (t_0)
     (let ((or-part_0 (eq? t_0 variable)))
       (if or-part_0 or-part_0 (local-variable? t_0)))))
-(define finish748
+(define finish745
   (make-struct-type-install-properties
    '(local-variable)
    1
@@ -18526,7 +18470,7 @@
    #f
    1
    0))
-(define effect_2625 (finish748 struct:local-variable))
+(define effect_2625 (finish745 struct:local-variable))
 (define local-variable1.1
   (|#%name|
    local-variable
@@ -18571,7 +18515,7 @@
     (if (1/set!-transformer? t_0)
       (1/set!-transformer-procedure t_0)
       (if (1/rename-transformer? t_0) (lambda (s_0) s_0) t_0))))
-(define finish751
+(define finish748
   (make-struct-type-install-properties
    '(core-form)
    2
@@ -18592,7 +18536,7 @@
    #f
    2
    0))
-(define effect_2077 (finish751 struct:core-form))
+(define effect_2077 (finish748 struct:core-form))
 (define core-form7.1
   (|#%name|
    core-form
@@ -18867,7 +18811,7 @@
            (for-loop_0 #f lst_0)))))))
 (define free-id-set-empty-or-just-module*?
   (lambda (fs_0) (let ((c_0 (hash-count fs_0))) (<= c_0 1))))
-(define finish763
+(define finish760
   (make-struct-type-install-properties
    '(expand-context)
    11
@@ -18888,7 +18832,7 @@
    #f
    11
    0))
-(define effect_2851 (finish763 struct:expand-context/outer))
+(define effect_2851 (finish760 struct:expand-context/outer))
 (define expand-context/outer1.1
   (|#%name|
    expand-context/outer
@@ -18940,7 +18884,7 @@
   (|#%name|
    expand-context-name
    (record-accessor struct:expand-context/outer 10)))
-(define finish765
+(define finish762
   (make-struct-type-install-properties
    '(expand-context/inner)
    22
@@ -18961,7 +18905,7 @@
    #f
    22
    0))
-(define effect_3326 (finish765 struct:expand-context/inner))
+(define effect_3326 (finish762 struct:expand-context/inner))
 (define expand-context/inner2.1
   (|#%name|
    expand-context/inner
@@ -21396,7 +21340,7 @@
                        fold-var_0))))))
               (for-loop_0 null s_0)))))
         s_0))))
-(define finish925
+(define finish922
   (make-struct-type-install-properties
    '(compile-context)
    7
@@ -21417,7 +21361,7 @@
    #f
    7
    0))
-(define effect_2620 (finish925 struct:compile-context))
+(define effect_2620 (finish922 struct:compile-context))
 (define compile-context1.1
   (|#%name|
    compile-context
@@ -23892,7 +23836,7 @@
   (lambda (i_0)
     (let ((len_0 (|#%app| read-fasl-integer i_0)))
       (read-bytes/exactly len_0 i_0))))
-(define finish1073
+(define finish1070
   (make-struct-type-install-properties
    '(mpi-intern-table)
    2
@@ -23913,7 +23857,7 @@
    #f
    2
    0))
-(define effect_2611 (finish1073 struct:mpi-intern-table))
+(define effect_2611 (finish1070 struct:mpi-intern-table))
 (define mpi-intern-table1.1
   (|#%name|
    mpi-intern-table
@@ -24148,7 +24092,7 @@
 (define top-level-bind!-id (make-built-in-symbol! 'top-level-bind!))
 (define top-level-require!-id (make-built-in-symbol! 'top-level-require!))
 (define mpi-vector-id (make-built-in-symbol! 'mpi-vector))
-(define finish1082
+(define finish1079
   (make-struct-type-install-properties
    '(module-path-index-table)
    2
@@ -24169,7 +24113,7 @@
    #f
    2
    0))
-(define effect_2626 (finish1082 struct:module-path-index-table))
+(define effect_2626 (finish1079 struct:module-path-index-table))
 (define module-path-index-table1.1
   (|#%name|
    module-path-index-table
@@ -28010,7 +27954,7 @@
    module-use1.1
    'deserialize
    deserialize))
-(define finish1171
+(define finish1168
   (make-struct-type-install-properties
    '(parsed)
    1
@@ -28031,7 +27975,7 @@
    #f
    1
    0))
-(define effect_3056 (finish1171 struct:parsed))
+(define effect_3056 (finish1168 struct:parsed))
 (define parsed1.1
   (|#%name|
    parsed
@@ -28039,7 +27983,7 @@
     (make-record-constructor-descriptor struct:parsed #f #f))))
 (define parsed? (|#%name| parsed? (record-predicate struct:parsed)))
 (define parsed-s (|#%name| parsed-s (record-accessor struct:parsed 0)))
-(define finish1173
+(define finish1170
   (make-struct-type-install-properties
    '(parsed-id)
    2
@@ -28060,7 +28004,7 @@
    #f
    2
    0))
-(define effect_2596 (finish1173 struct:parsed-id))
+(define effect_2596 (finish1170 struct:parsed-id))
 (define parsed-id2.1
   (|#%name|
    parsed-id
@@ -28071,7 +28015,7 @@
   (|#%name| parsed-id-binding (record-accessor struct:parsed-id 0)))
 (define parsed-id-inspector
   (|#%name| parsed-id-inspector (record-accessor struct:parsed-id 1)))
-(define finish1175
+(define finish1172
   (make-struct-type-install-properties
    '(parsed-primitive-id)
    0
@@ -28092,7 +28036,7 @@
    #f
    0
    0))
-(define effect_2448 (finish1175 struct:parsed-primitive-id))
+(define effect_2448 (finish1172 struct:parsed-primitive-id))
 (define parsed-primitive-id3.1
   (|#%name|
    parsed-primitive-id
@@ -28102,7 +28046,7 @@
   (|#%name|
    parsed-primitive-id?
    (record-predicate struct:parsed-primitive-id)))
-(define finish1177
+(define finish1174
   (make-struct-type-install-properties
    '(parsed-top-id)
    0
@@ -28123,7 +28067,7 @@
    #f
    0
    0))
-(define effect_2581 (finish1177 struct:parsed-top-id))
+(define effect_2581 (finish1174 struct:parsed-top-id))
 (define parsed-top-id4.1
   (|#%name|
    parsed-top-id
@@ -28131,7 +28075,7 @@
     (make-record-constructor-descriptor struct:parsed-top-id #f #f))))
 (define parsed-top-id?
   (|#%name| parsed-top-id? (record-predicate struct:parsed-top-id)))
-(define finish1179
+(define finish1176
   (make-struct-type-install-properties
    '(parsed-lambda)
    2
@@ -28152,7 +28096,7 @@
    #f
    2
    0))
-(define effect_2349 (finish1179 struct:parsed-lambda))
+(define effect_2349 (finish1176 struct:parsed-lambda))
 (define parsed-lambda5.1
   (|#%name|
    parsed-lambda
@@ -28164,7 +28108,7 @@
   (|#%name| parsed-lambda-keys (record-accessor struct:parsed-lambda 0)))
 (define parsed-lambda-body
   (|#%name| parsed-lambda-body (record-accessor struct:parsed-lambda 1)))
-(define finish1181
+(define finish1178
   (make-struct-type-install-properties
    '(parsed-case-lambda)
    1
@@ -28185,7 +28129,7 @@
    #f
    1
    0))
-(define effect_2437 (finish1181 struct:parsed-case-lambda))
+(define effect_2437 (finish1178 struct:parsed-case-lambda))
 (define parsed-case-lambda6.1
   (|#%name|
    parsed-case-lambda
@@ -28197,7 +28141,7 @@
   (|#%name|
    parsed-case-lambda-clauses
    (record-accessor struct:parsed-case-lambda 0)))
-(define finish1183
+(define finish1180
   (make-struct-type-install-properties
    '(parsed-app)
    2
@@ -28218,7 +28162,7 @@
    #f
    2
    0))
-(define effect_2862 (finish1183 struct:parsed-app))
+(define effect_2862 (finish1180 struct:parsed-app))
 (define parsed-app7.1
   (|#%name|
    parsed-app
@@ -28230,7 +28174,7 @@
   (|#%name| parsed-app-rator (record-accessor struct:parsed-app 0)))
 (define parsed-app-rands
   (|#%name| parsed-app-rands (record-accessor struct:parsed-app 1)))
-(define finish1185
+(define finish1182
   (make-struct-type-install-properties
    '(parsed-if)
    3
@@ -28251,7 +28195,7 @@
    #f
    3
    0))
-(define effect_2506 (finish1185 struct:parsed-if))
+(define effect_2506 (finish1182 struct:parsed-if))
 (define parsed-if8.1
   (|#%name|
    parsed-if
@@ -28264,7 +28208,7 @@
   (|#%name| parsed-if-thn (record-accessor struct:parsed-if 1)))
 (define parsed-if-els
   (|#%name| parsed-if-els (record-accessor struct:parsed-if 2)))
-(define finish1187
+(define finish1184
   (make-struct-type-install-properties
    '(parsed-set!)
    2
@@ -28285,7 +28229,7 @@
    #f
    2
    0))
-(define effect_2747 (finish1187 struct:parsed-set!))
+(define effect_2747 (finish1184 struct:parsed-set!))
 (define parsed-set!9.1
   (|#%name|
    parsed-set!
@@ -28297,7 +28241,7 @@
   (|#%name| parsed-set!-id (record-accessor struct:parsed-set! 0)))
 (define parsed-set!-rhs
   (|#%name| parsed-set!-rhs (record-accessor struct:parsed-set! 1)))
-(define finish1189
+(define finish1186
   (make-struct-type-install-properties
    '(parsed-with-continuation-mark)
    3
@@ -28318,7 +28262,7 @@
    #f
    3
    0))
-(define effect_2564 (finish1189 struct:parsed-with-continuation-mark))
+(define effect_2564 (finish1186 struct:parsed-with-continuation-mark))
 (define parsed-with-continuation-mark10.1
   (|#%name|
    parsed-with-continuation-mark
@@ -28343,7 +28287,7 @@
   (|#%name|
    parsed-with-continuation-mark-body
    (record-accessor struct:parsed-with-continuation-mark 2)))
-(define finish1191
+(define finish1188
   (make-struct-type-install-properties
    '(|parsed-#%variable-reference|)
    1
@@ -28364,7 +28308,7 @@
    #f
    1
    0))
-(define effect_3025 (finish1191 |struct:parsed-#%variable-reference|))
+(define effect_3025 (finish1188 |struct:parsed-#%variable-reference|))
 (define |parsed-#%variable-reference11.1|
   (|#%name|
    |parsed-#%variable-reference|
@@ -28381,7 +28325,7 @@
   (|#%name|
    |parsed-#%variable-reference-id|
    (record-accessor |struct:parsed-#%variable-reference| 0)))
-(define finish1193
+(define finish1190
   (make-struct-type-install-properties
    '(parsed-begin)
    1
@@ -28402,7 +28346,7 @@
    #f
    1
    0))
-(define effect_2189 (finish1193 struct:parsed-begin))
+(define effect_2189 (finish1190 struct:parsed-begin))
 (define parsed-begin12.1
   (|#%name|
    parsed-begin
@@ -28412,7 +28356,7 @@
   (|#%name| parsed-begin? (record-predicate struct:parsed-begin)))
 (define parsed-begin-body
   (|#%name| parsed-begin-body (record-accessor struct:parsed-begin 0)))
-(define finish1195
+(define finish1192
   (make-struct-type-install-properties
    '(parsed-begin0)
    1
@@ -28433,7 +28377,7 @@
    #f
    1
    0))
-(define effect_2190 (finish1195 struct:parsed-begin0))
+(define effect_2190 (finish1192 struct:parsed-begin0))
 (define parsed-begin013.1
   (|#%name|
    parsed-begin0
@@ -28443,7 +28387,7 @@
   (|#%name| parsed-begin0? (record-predicate struct:parsed-begin0)))
 (define parsed-begin0-body
   (|#%name| parsed-begin0-body (record-accessor struct:parsed-begin0 0)))
-(define finish1197
+(define finish1194
   (make-struct-type-install-properties
    '(parsed-quote)
    1
@@ -28464,7 +28408,7 @@
    #f
    1
    0))
-(define effect_2174 (finish1197 struct:parsed-quote))
+(define effect_2174 (finish1194 struct:parsed-quote))
 (define parsed-quote14.1
   (|#%name|
    parsed-quote
@@ -28474,7 +28418,7 @@
   (|#%name| parsed-quote? (record-predicate struct:parsed-quote)))
 (define parsed-quote-datum
   (|#%name| parsed-quote-datum (record-accessor struct:parsed-quote 0)))
-(define finish1199
+(define finish1196
   (make-struct-type-install-properties
    '(parsed-quote-syntax)
    1
@@ -28495,7 +28439,7 @@
    #f
    1
    0))
-(define effect_3320 (finish1199 struct:parsed-quote-syntax))
+(define effect_3320 (finish1196 struct:parsed-quote-syntax))
 (define parsed-quote-syntax15.1
   (|#%name|
    parsed-quote-syntax
@@ -28509,7 +28453,7 @@
   (|#%name|
    parsed-quote-syntax-datum
    (record-accessor struct:parsed-quote-syntax 0)))
-(define finish1201
+(define finish1198
   (make-struct-type-install-properties
    '(parsed-let_-values)
    3
@@ -28530,7 +28474,7 @@
    #f
    3
    0))
-(define effect_2494 (finish1201 struct:parsed-let_-values))
+(define effect_2494 (finish1198 struct:parsed-let_-values))
 (define parsed-let_-values16.1
   (|#%name|
    parsed-let_-values
@@ -28550,7 +28494,7 @@
   (|#%name|
    parsed-let_-values-body
    (record-accessor struct:parsed-let_-values 2)))
-(define finish1203
+(define finish1200
   (make-struct-type-install-properties
    '(parsed-let-values)
    0
@@ -28571,7 +28515,7 @@
    #f
    0
    0))
-(define effect_2429 (finish1203 struct:parsed-let-values))
+(define effect_2429 (finish1200 struct:parsed-let-values))
 (define parsed-let-values17.1
   (|#%name|
    parsed-let-values
@@ -28579,7 +28523,7 @@
     (make-record-constructor-descriptor struct:parsed-let-values #f #f))))
 (define parsed-let-values?
   (|#%name| parsed-let-values? (record-predicate struct:parsed-let-values)))
-(define finish1205
+(define finish1202
   (make-struct-type-install-properties
    '(parsed-letrec-values)
    0
@@ -28600,7 +28544,7 @@
    #f
    0
    0))
-(define effect_2573 (finish1205 struct:parsed-letrec-values))
+(define effect_2573 (finish1202 struct:parsed-letrec-values))
 (define parsed-letrec-values18.1
   (|#%name|
    parsed-letrec-values
@@ -28610,7 +28554,7 @@
   (|#%name|
    parsed-letrec-values?
    (record-predicate struct:parsed-letrec-values)))
-(define finish1207
+(define finish1204
   (make-struct-type-install-properties
    '(parsed-define-values)
    3
@@ -28631,7 +28575,7 @@
    #f
    3
    0))
-(define effect_2826 (finish1207 struct:parsed-define-values))
+(define effect_2826 (finish1204 struct:parsed-define-values))
 (define parsed-define-values19.1
   (|#%name|
    parsed-define-values
@@ -28653,7 +28597,7 @@
   (|#%name|
    parsed-define-values-rhs
    (record-accessor struct:parsed-define-values 2)))
-(define finish1209
+(define finish1206
   (make-struct-type-install-properties
    '(parsed-define-syntaxes)
    3
@@ -28674,7 +28618,7 @@
    #f
    3
    0))
-(define effect_2530 (finish1209 struct:parsed-define-syntaxes))
+(define effect_2530 (finish1206 struct:parsed-define-syntaxes))
 (define parsed-define-syntaxes20.1
   (|#%name|
    parsed-define-syntaxes
@@ -28696,7 +28640,7 @@
   (|#%name|
    parsed-define-syntaxes-rhs
    (record-accessor struct:parsed-define-syntaxes 2)))
-(define finish1211
+(define finish1208
   (make-struct-type-install-properties
    '(parsed-begin-for-syntax)
    1
@@ -28717,7 +28661,7 @@
    #f
    1
    0))
-(define effect_2361 (finish1211 struct:parsed-begin-for-syntax))
+(define effect_2361 (finish1208 struct:parsed-begin-for-syntax))
 (define parsed-begin-for-syntax21.1
   (|#%name|
    parsed-begin-for-syntax
@@ -28734,7 +28678,7 @@
   (|#%name|
    parsed-begin-for-syntax-body
    (record-accessor struct:parsed-begin-for-syntax 0)))
-(define finish1213
+(define finish1210
   (make-struct-type-install-properties
    '(|parsed-#%declare|)
    0
@@ -28755,7 +28699,7 @@
    #f
    0
    0))
-(define effect_2603 (finish1213 |struct:parsed-#%declare|))
+(define effect_2603 (finish1210 |struct:parsed-#%declare|))
 (define |parsed-#%declare22.1|
   (|#%name|
    |parsed-#%declare|
@@ -28763,7 +28707,7 @@
     (make-record-constructor-descriptor |struct:parsed-#%declare| #f #f))))
 (define |parsed-#%declare?|
   (|#%name| |parsed-#%declare?| (record-predicate |struct:parsed-#%declare|)))
-(define finish1215
+(define finish1212
   (make-struct-type-install-properties
    '(parsed-require)
    0
@@ -28784,7 +28728,7 @@
    #f
    0
    0))
-(define effect_2194 (finish1215 struct:parsed-require))
+(define effect_2194 (finish1212 struct:parsed-require))
 (define parsed-require23.1
   (|#%name|
    parsed-require
@@ -28792,7 +28736,7 @@
     (make-record-constructor-descriptor struct:parsed-require #f #f))))
 (define parsed-require?
   (|#%name| parsed-require? (record-predicate struct:parsed-require)))
-(define finish1217
+(define finish1214
   (make-struct-type-install-properties
    '(|parsed-#%module-begin|)
    1
@@ -28813,7 +28757,7 @@
    #f
    1
    0))
-(define effect_2515 (finish1217 |struct:parsed-#%module-begin|))
+(define effect_2515 (finish1214 |struct:parsed-#%module-begin|))
 (define |parsed-#%module-begin24.1|
   (|#%name|
    |parsed-#%module-begin|
@@ -28830,7 +28774,7 @@
   (|#%name|
    |parsed-#%module-begin-body|
    (record-accessor |struct:parsed-#%module-begin| 0)))
-(define finish1219
+(define finish1216
   (make-struct-type-install-properties
    '(parsed-module)
    10
@@ -28851,7 +28795,7 @@
    #f
    10
    0))
-(define effect_2433 (finish1219 struct:parsed-module))
+(define effect_2433 (finish1216 struct:parsed-module))
 (define parsed-module25.1
   (|#%name|
    parsed-module
@@ -28967,7 +28911,7 @@
          (for-loop_0
           (seteq)
           (unsafe-immutable-hash-iterate-first s-scs_0)))))))
-(define finish1224
+(define finish1221
   (make-struct-type-install-properties
    '(requires+provides)
    9
@@ -28988,7 +28932,7 @@
    #f
    9
    384))
-(define effect_3171 (finish1224 struct:requires+provides))
+(define effect_3171 (finish1221 struct:requires+provides))
 (define requires+provides1.1
   (|#%name|
    requires+provides
@@ -29040,7 +28984,7 @@
   (|#%name|
    set-requires+provides-all-bindings-simple?!
    (record-mutator struct:requires+provides 8)))
-(define finish1226
+(define finish1223
   (make-struct-type-install-properties
    '(required)
    4
@@ -29061,7 +29005,7 @@
    #f
    4
    0))
-(define effect_2757 (finish1226 struct:required))
+(define effect_2757 (finish1223 struct:required))
 (define required2.1
   (|#%name|
    required
@@ -29075,7 +29019,7 @@
   (|#%name| required-can-be-shadowed? (record-accessor struct:required 2)))
 (define required-as-transformer?
   (|#%name| required-as-transformer? (record-accessor struct:required 3)))
-(define finish1228
+(define finish1225
   (make-struct-type-install-properties
    '(nominal)
    4
@@ -29096,7 +29040,7 @@
    #f
    4
    0))
-(define effect_2287 (finish1228 struct:nominal))
+(define effect_2287 (finish1225 struct:nominal))
 (define nominal3.1
   (|#%name|
    nominal
@@ -29110,7 +29054,7 @@
 (define nominal-require-phase
   (|#%name| nominal-require-phase (record-accessor struct:nominal 2)))
 (define nominal-sym (|#%name| nominal-sym (record-accessor struct:nominal 3)))
-(define finish1230
+(define finish1227
   (make-struct-type-install-properties
    '(bulk-required)
    5
@@ -29131,7 +29075,7 @@
    #f
    5
    0))
-(define effect_3099 (finish1230 struct:bulk-required))
+(define effect_3099 (finish1227 struct:bulk-required))
 (define bulk-required4.1
   (|#%name|
    bulk-required
@@ -30559,7 +30503,7 @@
                   (args (raise-binding-result-arity-error 2 args))))
                 table_0))))))
        (for-loop_0 hash2589 (hash-iterate-first provides_0))))))
-(define finish1295
+(define finish1292
   (make-struct-type-install-properties
    '(adjust-only)
    1
@@ -30580,7 +30524,7 @@
    #f
    1
    0))
-(define effect_2893 (finish1295 struct:adjust-only))
+(define effect_2893 (finish1292 struct:adjust-only))
 (define adjust-only1.1
   (|#%name|
    adjust-only
@@ -30612,7 +30556,7 @@
          s
          'adjust-only
          'syms))))))
-(define finish1299
+(define finish1296
   (make-struct-type-install-properties
    '(adjust-prefix)
    1
@@ -30633,7 +30577,7 @@
    #f
    1
    0))
-(define effect_2600 (finish1299 struct:adjust-prefix))
+(define effect_2600 (finish1296 struct:adjust-prefix))
 (define adjust-prefix2.1
   (|#%name|
    adjust-prefix
@@ -30667,7 +30611,7 @@
          s
          'adjust-prefix
          'sym))))))
-(define finish1303
+(define finish1300
   (make-struct-type-install-properties
    '(adjust-all-except)
    2
@@ -30688,7 +30632,7 @@
    #f
    2
    0))
-(define effect_2205 (finish1303 struct:adjust-all-except))
+(define effect_2205 (finish1300 struct:adjust-all-except))
 (define adjust-all-except3.1
   (|#%name|
    adjust-all-except
@@ -30742,7 +30686,7 @@
          s
          'adjust-all-except
          'syms))))))
-(define finish1308
+(define finish1305
   (make-struct-type-install-properties
    '(adjust-rename)
    2
@@ -30763,7 +30707,7 @@
    #f
    2
    0))
-(define effect_3082 (finish1308 struct:adjust-rename))
+(define effect_3082 (finish1305 struct:adjust-rename))
 (define adjust-rename4.1
   (|#%name|
    adjust-rename
@@ -33652,7 +33596,7 @@
                 ns_0
                 temp14_1
                 temp15_0)))))))))
-(define finish1354
+(define finish1351
   (make-struct-type-install-properties
    '(compiled-in-memory)
    13
@@ -33677,7 +33621,7 @@
    #f
    13
    0))
-(define effect_2572 (finish1354 struct:compiled-in-memory))
+(define effect_2572 (finish1351 struct:compiled-in-memory))
 (define compiled-in-memory1.1
   (|#%name|
    compiled-in-memory
@@ -33994,7 +33938,7 @@
 (define correlated-column (lambda (s_0) (syntax-column s_0)))
 (define correlated-position (lambda (s_0) (syntax-position s_0)))
 (define correlated-span (lambda (s_0) (syntax-span s_0)))
-(define finish1370
+(define finish1367
   (make-struct-type-install-properties
    '(correlated-linklet)
    3
@@ -34015,7 +33959,7 @@
    #f
    3
    4))
-(define effect_2738 (finish1370 struct:correlated-linklet))
+(define effect_2738 (finish1367 struct:correlated-linklet))
 (define correlated-linklet1.1
   (|#%name|
    correlated-linklet
@@ -34068,7 +34012,7 @@
        "cannot evaluate unknown linklet: ~s"
        l_0))))
 (define correlated-linklet-vm-bytes #vu8(108 105 110 107 108 101 116))
-(define finish1373
+(define finish1370
   (make-struct-type-install-properties
    '(faslable-correlated)
    7
@@ -34095,7 +34039,7 @@
    #f
    7
    127))
-(define effect_2370 (finish1373 struct:faslable-correlated))
+(define effect_2370 (finish1370 struct:faslable-correlated))
 (define faslable-correlated2.1
   (|#%name|
    faslable-correlated
@@ -34241,7 +34185,7 @@
          s
          'faslable-correlated
          'props))))))
-(define finish1383
+(define finish1380
   (make-struct-type-install-properties
    '(faslable-correlated-linklet)
    2
@@ -34268,7 +34212,7 @@
    #f
    2
    3))
-(define effect_2374 (finish1383 struct:faslable-correlated-linklet))
+(define effect_2374 (finish1380 struct:faslable-correlated-linklet))
 (define faslable-correlated-linklet3.1
   (|#%name|
    faslable-correlated-linklet
@@ -34994,7 +34938,7 @@
 (define write-int
   (lambda (n_0 port_0)
     (write-bytes (integer->integer-bytes n_0 4 #f #f) port_0)))
-(define finish1429
+(define finish1426
   (make-struct-type-install-properties
    '(linklet-directory)
    1
@@ -35024,7 +34968,7 @@
    #f
    1
    0))
-(define effect_2692 (finish1429 struct:linklet-directory))
+(define effect_2692 (finish1426 struct:linklet-directory))
 (define linklet-directory1.1
   (|#%name|
    linklet-directory
@@ -35058,7 +35002,7 @@
          s
          'linklet-directory
          'ht))))))
-(define finish1433
+(define finish1430
   (make-struct-type-install-properties
    '(linklet-bundle)
    1
@@ -35087,7 +35031,7 @@
    #f
    1
    0))
-(define effect_2464 (finish1433 struct:linklet-bundle))
+(define effect_2464 (finish1430 struct:linklet-bundle))
 (define linklet-bundle2.1
   (|#%name|
    linklet-bundle
@@ -35285,7 +35229,7 @@
                     (args (raise-binding-result-arity-error 2 args))))
                   result_0))))))
          (for-loop_0 #t (hash-iterate-first ht_0)))))))
-(define finish1437
+(define finish1434
   (make-struct-type-install-properties
    '(namespace-scopes)
    2
@@ -35306,7 +35250,7 @@
    #f
    2
    3))
-(define effect_2465 (finish1437 struct:namespace-scopes))
+(define effect_2465 (finish1434 struct:namespace-scopes))
 (define namespace-scopes1.1
   (|#%name|
    namespace-scopes
@@ -35427,7 +35371,7 @@
       (let ((app_0 (namespace-scopes-other nss1_0)))
         (set=? app_0 (namespace-scopes-other nss2_0)))
       #f)))
-(define finish1453
+(define finish1450
   (make-struct-type-install-properties
    '(syntax-literals)
    2
@@ -35448,7 +35392,7 @@
    #f
    2
    3))
-(define effect_2822 (finish1453 struct:syntax-literals))
+(define effect_2822 (finish1450 struct:syntax-literals))
 (define syntax-literals1.1
   (|#%name|
    syntax-literals
@@ -35538,7 +35482,7 @@
          v
          'syntax-literals
          'count))))))
-(define finish1460
+(define finish1457
   (make-struct-type-install-properties
    '(header)
    8
@@ -35559,7 +35503,7 @@
    #f
    8
    36))
-(define effect_2459 (finish1460 struct:header))
+(define effect_2459 (finish1457 struct:header))
 (define header2.1
   (|#%name|
    header
@@ -35748,7 +35692,7 @@
          v
          'header
          'require-vars-in-order))))))
-(define finish1473
+(define finish1470
   (make-struct-type-install-properties
    '(variable-use)
    2
@@ -35769,7 +35713,7 @@
    #f
    2
    0))
-(define effect_2838 (finish1473 struct:variable-use))
+(define effect_2838 (finish1470 struct:variable-use))
 (define variable-use3.1
   (|#%name|
    variable-use
@@ -37339,7 +37283,7 @@
           (if (extra-inspectors-allow? extra-inspectors-1_0 guard-insp_0)
             (extra-inspectors-allow? extra-inspectors-2_0 guard-insp_0)
             #f))))))
-(define finish1634
+(define finish1631
   (make-struct-type-install-properties
    '(module-use*)
    2
@@ -37360,7 +37304,7 @@
    #f
    2
    3))
-(define effect_2316 (finish1634 struct:module-use*))
+(define effect_2316 (finish1631 struct:module-use*))
 (define module-use*1.1
   (|#%name|
    module-use*
@@ -37774,7 +37718,7 @@
           (set-module-use*-extra-inspectorss!
            existing-mu*_0
            new-extra-inspectorss_0))))))
-(define finish1644
+(define finish1641
   (make-struct-type-install-properties
    '(link-info)
    4
@@ -37795,7 +37739,7 @@
    #f
    4
    0))
-(define effect_2792 (finish1644 struct:link-info))
+(define effect_2792 (finish1641 struct:link-info))
 (define link-info1.1
   (|#%name|
    link-info
@@ -39892,7 +39836,7 @@
                   (let ((app_0 (car cims_1)))
                     (cons app_0 (cdr cims_1)))))))))))
      (loop_0 cims_0))))
-(define finish1711
+(define finish1708
   (make-struct-type-install-properties
    '(known-defined/delay)
    1
@@ -39913,7 +39857,7 @@
    #f
    1
    1))
-(define effect_2998 (finish1711 struct:known-defined/delay))
+(define effect_2998 (finish1708 struct:known-defined/delay))
 (define known-defined/delay2.1
   (|#%name|
    known-defined/delay
@@ -39951,7 +39895,7 @@
          s
          'known-defined/delay
          'thunk))))))
-(define finish1715
+(define finish1712
   (make-struct-type-install-properties
    '(known-property)
    0
@@ -39972,7 +39916,7 @@
    #f
    0
    0))
-(define effect_2476 (finish1715 struct:known-property))
+(define effect_2476 (finish1712 struct:known-property))
 (define known-property3.1
   (|#%name|
    known-property
@@ -39990,7 +39934,7 @@
         (if (impersonator? v)
           (known-property?_2907 (impersonator-val v))
           #f))))))
-(define finish1718
+(define finish1715
   (make-struct-type-install-properties
    '(known-property-of-function)
    1
@@ -40017,7 +39961,7 @@
    #f
    1
    1))
-(define effect_2945 (finish1718 struct:known-property-of-function))
+(define effect_2945 (finish1715 struct:known-property-of-function))
 (define known-property-of-function4.1
   (|#%name|
    known-property-of-function
@@ -40058,7 +40002,7 @@
          s
          'known-property-of-function
          'arity))))))
-(define finish1722
+(define finish1719
   (make-struct-type-install-properties
    '(known-function)
    2
@@ -40079,7 +40023,7 @@
    #f
    2
    3))
-(define effect_2741 (finish1722 struct:known-function))
+(define effect_2741 (finish1719 struct:known-function))
 (define known-function5.1
   (|#%name|
    known-function
@@ -40129,7 +40073,7 @@
          s
          'known-function
          'pure?))))))
-(define finish1727
+(define finish1724
   (make-struct-type-install-properties
    '(known-function-of-satisfying)
    1
@@ -40156,7 +40100,7 @@
    #f
    1
    1))
-(define effect_2265 (finish1727 struct:known-function-of-satisfying))
+(define effect_2265 (finish1724 struct:known-function-of-satisfying))
 (define known-function-of-satisfying6.1
   (|#%name|
    known-function-of-satisfying
@@ -40197,7 +40141,7 @@
          s
          'known-function-of-satisfying
          'arg-predicate-keys))))))
-(define finish1731
+(define finish1728
   (make-struct-type-install-properties
    '(known-predicate)
    1
@@ -40218,7 +40162,7 @@
    #f
    1
    1))
-(define effect_2144 (finish1731 struct:known-predicate))
+(define effect_2144 (finish1728 struct:known-predicate))
 (define known-predicate7.1
   (|#%name|
    known-predicate
@@ -40252,7 +40196,7 @@
          s
          'known-predicate
          'key))))))
-(define finish1735
+(define finish1732
   (make-struct-type-install-properties
    '(known-satisfies)
    1
@@ -40273,7 +40217,7 @@
    #f
    1
    1))
-(define effect_1976 (finish1735 struct:known-satisfies))
+(define effect_1976 (finish1732 struct:known-satisfies))
 (define known-satisfies8.1
   (|#%name|
    known-satisfies
@@ -40309,7 +40253,7 @@
          s
          'known-satisfies
          'predicate-key))))))
-(define finish1739
+(define finish1736
   (make-struct-type-install-properties
    '(known-struct-op)
    2
@@ -40330,7 +40274,7 @@
    #f
    2
    3))
-(define effect_2534 (finish1739 struct:known-struct-op))
+(define effect_2534 (finish1736 struct:known-struct-op))
 (define known-struct-op9.1
   (|#%name|
    known-struct-op
@@ -44903,7 +44847,7 @@
                                                              ns_0))))))))))))))))))))))))
                (args (raise-binding-result-arity-error 4 args))))
              (if log-performance? (end-performance-region) (void)))))))))
-(define finish1803
+(define finish1800
   (make-struct-type-install-properties
    '(instance-data)
    2
@@ -44924,7 +44868,7 @@
    #f
    2
    0))
-(define effect_2595 (finish1803 struct:instance-data))
+(define effect_2595 (finish1800 struct:instance-data))
 (define instance-data9.1
   (|#%name|
    instance-data
@@ -47356,7 +47300,7 @@
                        table_0))))))
               (for-loop_0 hash2610 (hash-iterate-first ht_0))))))
         c_0))))
-(define finish1895
+(define finish1892
   (make-struct-type-install-properties
    '(recompiled)
    3
@@ -47377,7 +47321,7 @@
    #f
    3
    0))
-(define effect_1973 (finish1895 struct:recompiled))
+(define effect_1973 (finish1892 struct:recompiled))
 (define recompiled1.1
   (|#%name|
    recompiled
@@ -48904,7 +48848,7 @@
 (define box-cons! (lambda (b_0 v_0) (set-box! b_0 (cons v_0 (unbox b_0)))))
 (define box-clear!
   (lambda (b_0) (begin0 (reverse$1 (unbox b_0)) (set-box! b_0 null))))
-(define finish1932
+(define finish1929
   (make-struct-type-install-properties
    '(lift-context)
    3
@@ -48925,7 +48869,7 @@
    #f
    3
    0))
-(define effect_1545 (finish1932 struct:lift-context))
+(define effect_1545 (finish1929 struct:lift-context))
 (define lift-context1.1
   (|#%name|
    lift-context
@@ -48939,7 +48883,7 @@
   (|#%name| lift-context-lifts (record-accessor struct:lift-context 1)))
 (define lift-context-module*-ok?
   (|#%name| lift-context-module*-ok? (record-accessor struct:lift-context 2)))
-(define finish1934
+(define finish1931
   (make-struct-type-install-properties
    '(lifted-bind)
    3
@@ -48960,7 +48904,7 @@
    #f
    3
    0))
-(define effect_1767 (finish1934 struct:lifted-bind))
+(define effect_1767 (finish1931 struct:lifted-bind))
 (define lifted-bind2.1
   (|#%name|
    lifted-bind
@@ -49191,7 +49135,7 @@
                          (for-loop_0 fold-var_2 rest_0)))))
                  fold-var_0))))))
         (for-loop_0 null lifts_0))))))
-(define finish1944
+(define finish1941
   (make-struct-type-install-properties
    '(module-lift-context)
    3
@@ -49212,7 +49156,7 @@
    #f
    3
    0))
-(define effect_2649 (finish1944 struct:module-lift-context))
+(define effect_2649 (finish1941 struct:module-lift-context))
 (define module-lift-context15.1
   (|#%name|
    module-lift-context
@@ -49273,7 +49217,7 @@
           (box-cons! (lift-context-lifts module-lifts_0) s_0)
           (error
            "internal error: unrecognized lift-context type for module lift"))))))
-(define finish1946
+(define finish1943
   (make-struct-type-install-properties
    '(require-lift-context)
    3
@@ -49294,7 +49238,7 @@
    #f
    3
    0))
-(define effect_3057 (finish1946 struct:require-lift-context))
+(define effect_3057 (finish1943 struct:require-lift-context))
 (define require-lift-context16.1
   (|#%name|
    require-lift-context
@@ -49327,7 +49271,7 @@
     (begin
       (|#%app| (require-lift-context-do-require require-lifts_0) s_0 phase_0)
       (box-cons! (require-lift-context-requires require-lifts_0) s_0))))
-(define finish1948
+(define finish1945
   (make-struct-type-install-properties
    '(to-module-lift-context)
    4
@@ -49348,7 +49292,7 @@
    #f
    4
    0))
-(define effect_3069 (finish1948 struct:to-module-lift-context))
+(define effect_3069 (finish1945 struct:to-module-lift-context))
 (define to-module-lift-context17.1
   (|#%name|
    to-module-lift-context
@@ -49397,7 +49341,7 @@
 (define add-lifted-to-module-end!
   (lambda (to-module-lifts_0 s_0 phase_0)
     (box-cons! (to-module-lift-context-ends to-module-lifts_0) s_0)))
-(define finish1951
+(define finish1948
   (make-struct-type-install-properties
    '(expanded-syntax)
    2
@@ -49418,7 +49362,7 @@
    #f
    2
    0))
-(define effect_2568 (finish1951 struct:already-expanded))
+(define effect_2568 (finish1948 struct:already-expanded))
 (define already-expanded1.1
   (|#%name|
    already-expanded
@@ -49475,7 +49419,7 @@
   has-liberal-define-context-property?
   liberal-define-context-value)
  (make-struct-type-property 'liberal-define-context))
-(define finish1956
+(define finish1953
   (make-struct-type-install-properties
    '(liberal-define-context)
    0
@@ -49496,7 +49440,7 @@
    #f
    0
    0))
-(define effect_2849 (finish1956 struct:liberal-define-context))
+(define effect_2849 (finish1953 struct:liberal-define-context))
 (define make-liberal-define-context
   (|#%name|
    make-liberal-define-context
@@ -49611,7 +49555,7 @@
                 (wrap_0 '|#%expression|)
                 (fail_0))
               (fail_0))))))))
-(define finish1963
+(define finish1960
   (make-struct-type-install-properties
    '(reference-record)
    3
@@ -49632,7 +49576,7 @@
    #f
    3
    7))
-(define effect_2371 (finish1963 struct:reference-record))
+(define effect_2371 (finish1960 struct:reference-record))
 (define reference-record1.1
   (|#%name|
    reference-record
@@ -49777,7 +49721,7 @@
         (let ((app_0 (syntax-disarm$1 orig-s3_0)))
           (datum->syntax$1 app_0 new4_0 orig-s3_0 (if track?1_0 orig-s3_0 #f)))
         orig-s3_0)))))
-(define finish1976
+(define finish1973
   (make-struct-type-install-properties
    '(expanded+parsed)
    2
@@ -49798,7 +49742,7 @@
    #f
    2
    0))
-(define effect_2270 (finish1976 struct:expanded+parsed))
+(define effect_2270 (finish1973 struct:expanded+parsed))
 (define expanded+parsed1.1
   (|#%name|
    expanded+parsed
@@ -49810,7 +49754,7 @@
   (|#%name| expanded+parsed-s (record-accessor struct:expanded+parsed 0)))
 (define expanded+parsed-parsed
   (|#%name| expanded+parsed-parsed (record-accessor struct:expanded+parsed 1)))
-(define finish1978
+(define finish1975
   (make-struct-type-install-properties
    '(semi-parsed-define-values)
    4
@@ -49831,7 +49775,7 @@
    #f
    4
    0))
-(define effect_2353 (finish1978 struct:semi-parsed-define-values))
+(define effect_2353 (finish1975 struct:semi-parsed-define-values))
 (define semi-parsed-define-values2.1
   (|#%name|
    semi-parsed-define-values
@@ -49860,7 +49804,7 @@
   (|#%name|
    semi-parsed-define-values-rhs
    (record-accessor struct:semi-parsed-define-values 3)))
-(define finish1980
+(define finish1977
   (make-struct-type-install-properties
    '(semi-parsed-begin-for-syntax)
    2
@@ -49881,7 +49825,7 @@
    #f
    2
    0))
-(define effect_2815 (finish1980 struct:semi-parsed-begin-for-syntax))
+(define effect_2815 (finish1977 struct:semi-parsed-begin-for-syntax))
 (define semi-parsed-begin-for-syntax3.1
   (|#%name|
    semi-parsed-begin-for-syntax
@@ -51924,7 +51868,7 @@
      module*
      |#%declare|
      |#%stratified-body|)))
-(define finish2122
+(define finish2119
   (make-struct-type-install-properties
    '(internal-definition-context)
    5
@@ -51945,7 +51889,7 @@
    #f
    5
    0))
-(define effect_2979 (finish2122 struct:internal-definition-context))
+(define effect_2979 (finish2119 struct:internal-definition-context))
 (define internal-definition-context1.1
   (|#%name|
    internal-definition-context
@@ -52058,7 +52002,7 @@
          s
          'internal-definition-context
          'parent-ctx))))))
-(define finish2130
+(define finish2127
   (make-struct-type-install-properties
    '(env-mixin)
    4
@@ -52079,7 +52023,7 @@
    #f
    4
    0))
-(define effect_2352 (finish2130 struct:env-mixin))
+(define effect_2352 (finish2127 struct:env-mixin))
 (define env-mixin2.1
   (|#%name|
    env-mixin
@@ -56848,7 +56792,7 @@
       ((s_0 ns_0 serializable?8_0)
        (compile_0 s_0 ns_0 serializable?8_0 unsafe-undefined))
       ((s_0 ns7_0) (compile_0 s_0 ns7_0 #t unsafe-undefined))))))
-(define finish2279
+(define finish2276
   (make-struct-type-install-properties
    '(lifted-parsed-begin)
    2
@@ -56869,7 +56813,7 @@
    #f
    2
    0))
-(define effect_2583 (finish2279 struct:lifted-parsed-begin))
+(define effect_2583 (finish2276 struct:lifted-parsed-begin))
 (define lifted-parsed-begin11.1
   (|#%name|
    lifted-parsed-begin
@@ -59118,7 +59062,7 @@
         current-directory
         (find-system-path 'orig-dir)))
      (|#%app| thunk_0))))
-(define finish2316
+(define finish2313
   (make-struct-type-install-properties
    '(shadow-directory)
    2
@@ -59139,7 +59083,7 @@
    #f
    2
    0))
-(define effect_2776 (finish2316 struct:shadow-directory))
+(define effect_2776 (finish2313 struct:shadow-directory))
 (define shadow-directory1.1
   (|#%name|
    shadow-directory
@@ -60043,7 +59987,7 @@
           v_0))
        v_0))
    'current-readtable))
-(define finish2346
+(define finish2343
   (make-struct-type-install-properties
    '(read-config)
    7
@@ -60064,7 +60008,7 @@
    #f
    7
    0))
-(define effect_2490 (finish2346 struct:read-config/outer))
+(define effect_2490 (finish2343 struct:read-config/outer))
 (define read-config/outer1.1
   (|#%name|
    read-config/outer
@@ -60090,7 +60034,7 @@
   (|#%name|
    read-config-keep-comment?
    (record-accessor struct:read-config/outer 6)))
-(define finish2348
+(define finish2345
   (make-struct-type-install-properties
    '(read-config/inner)
    13
@@ -60111,7 +60055,7 @@
    #f
    13
    0))
-(define effect_2436 (finish2348 struct:read-config/inner))
+(define effect_2436 (finish2345 struct:read-config/inner))
 (define read-config/inner2.1
   (|#%name|
    read-config/inner
@@ -60254,7 +60198,7 @@
     (read-config/inner-parameter-cache (read-config/outer-inner v_0))))
 (define read-config-st
   (lambda (v_0) (read-config/inner-st (read-config/outer-inner v_0))))
-(define finish2351
+(define finish2348
   (make-struct-type-install-properties
    '(read-config-state)
    2
@@ -60275,7 +60219,7 @@
    #f
    2
    3))
-(define effect_2073 (finish2351 struct:read-config-state))
+(define effect_2073 (finish2348 struct:read-config-state))
 (define read-config-state3.1
   (|#%name|
    read-config-state
@@ -60806,7 +60750,7 @@
           (check-parameter 1/read-accept-quasiquote config_0)
           (check-parameter 1/read-accept-reader config_0)
           (check-parameter 1/read-accept-lang config_0))))))
-(define finish2395
+(define finish2392
   (make-struct-type-install-properties
    '(special-comment)
    1
@@ -60827,7 +60771,7 @@
    #f
    1
    0))
-(define effect_3106 (finish2395 struct:special-comment))
+(define effect_3106 (finish2392 struct:special-comment))
 (define 1/make-special-comment
   (|#%name|
    make-special-comment
@@ -60837,7 +60781,7 @@
   (|#%name| special-comment? (record-predicate struct:special-comment)))
 (define 1/special-comment-value
   (|#%name| special-comment-value (record-accessor struct:special-comment 0)))
-(define finish2397
+(define finish2394
   (make-struct-type-install-properties
    '(readtable)
    4
@@ -60858,7 +60802,7 @@
    #f
    4
    0))
-(define effect_2167 (finish2397 struct:readtable))
+(define effect_2167 (finish2394 struct:readtable))
 (define readtable1.1
   (|#%name|
    readtable
@@ -61221,7 +61165,7 @@
                         (args (raise-binding-result-arity-error 2 args))))
                       fold-var_0))))))
              (for-loop_0 null (hash-iterate-first ht_0))))))))))
-(define finish2411
+(define finish2408
   (make-struct-type-install-properties
    '(special)
    1
@@ -61242,7 +61186,7 @@
    #f
    1
    0))
-(define effect_2677 (finish2411 struct:special))
+(define effect_2677 (finish2408 struct:special))
 (define special1.1
   (|#%name|
    special
@@ -61771,7 +61715,7 @@
             (if (if s_0 s_0 c_0)
               (format "~a or ~a" p_0 (if s_0 s_0 c_0))
               p_0)))))))
-(define finish2443
+(define finish2440
   (make-struct-type-install-properties
    '(accum-string)
    2
@@ -61792,7 +61736,7 @@
    #f
    2
    3))
-(define effect_2784 (finish2443 struct:accum-string))
+(define effect_2784 (finish2440 struct:accum-string))
 (define accum-string1.1
   (|#%name|
    accum-string
@@ -61895,7 +61839,7 @@
     (set-read-config-state-accum-str!
      (begin-unsafe (read-config/inner-st (read-config/outer-inner config_0)))
      a_0)))
-(define finish2457
+(define finish2454
   (make-struct-type-install-properties
    '(indentation)
    8
@@ -61916,7 +61860,7 @@
    #f
    8
    246))
-(define effect_2185 (finish2457 struct:indentation))
+(define effect_2185 (finish2454 struct:indentation))
 (define indentation1.1
   (|#%name|
    indentation
@@ -62930,7 +62874,7 @@
        decimal-mode_0
        convert-mode_0
        single-mode_0))))
-(define finish2506
+(define finish2503
   (make-struct-type-install-properties
    '(parse-state)
    5
@@ -62951,7 +62895,7 @@
    #f
    5
    0))
-(define effect_2177 (finish2506 struct:parse-state))
+(define effect_2177 (finish2503 struct:parse-state))
 (define parse-state6.1
   (|#%name|
    parse-state
@@ -62971,7 +62915,7 @@
   (|#%name|
    parse-state-other-exactness
    (record-accessor struct:parse-state 4)))
-(define finish2508
+(define finish2505
   (make-struct-type-install-properties
    '(rect-prefix)
    3
@@ -62992,7 +62936,7 @@
    #f
    3
    0))
-(define effect_2477 (finish2508 struct:rect-prefix))
+(define effect_2477 (finish2505 struct:rect-prefix))
 (define rect-prefix7.1
   (|#%name|
    rect-prefix
@@ -63006,7 +62950,7 @@
   (|#%name| rect-prefix-n (record-accessor struct:rect-prefix 1)))
 (define rect-prefix-start
   (|#%name| rect-prefix-start (record-accessor struct:rect-prefix 2)))
-(define finish2510
+(define finish2507
   (make-struct-type-install-properties
    '(polar-prefix)
    3
@@ -63027,7 +62971,7 @@
    #f
    3
    0))
-(define effect_2366 (finish2510 struct:polar-prefix))
+(define effect_2366 (finish2507 struct:polar-prefix))
 (define polar-prefix8.1
   (|#%name|
    polar-prefix
@@ -63129,7 +63073,7 @@
     (if (eq? (state->convert-mode state_0) 'must-read)
       (format "cannot combine extflonum `~a` into a complex number" i_0)
       #f)))
-(define finish2520
+(define finish2517
   (make-struct-type-install-properties
    '(lazy-expt)
    3
@@ -63150,7 +63094,7 @@
    #f
    3
    0))
-(define effect_2131 (finish2520 struct:lazy-expt))
+(define effect_2131 (finish2517 struct:lazy-expt))
 (define lazy-expt9.1
   (|#%name|
    lazy-expt
@@ -63163,7 +63107,7 @@
   (|#%name| lazy-expt-radix (record-accessor struct:lazy-expt 1)))
 (define lazy-expt-exp
   (|#%name| lazy-expt-exp (record-accessor struct:lazy-expt 2)))
-(define finish2522
+(define finish2519
   (make-struct-type-install-properties
    '(lazy-rational)
    2
@@ -63184,7 +63128,7 @@
    #f
    2
    0))
-(define effect_3104 (finish2522 struct:lazy-rational))
+(define effect_3104 (finish2519 struct:lazy-rational))
 (define lazy-rational10.1
   (|#%name|
    lazy-rational
diff --git a/racket/src/cs/schemified/io.scm b/racket/src/cs/schemified/io.scm
index 6dca0c65ee..6b3415a69b 100644
--- a/racket/src/cs/schemified/io.scm
+++ b/racket/src/cs/schemified/io.scm
@@ -448,113 +448,6 @@
    '11
    'sw_shownormal
    '12))
-(define bad-list$1
-  (|#%name|
-   bad-list
-   (lambda (who_0 orig-l_0)
-     (begin (raise-mismatch-error who_0 "not a proper list: " orig-l_0)))))
-(define memq
-  (|#%name|
-   memq
-   (lambda (v_0 orig-l_0)
-     (begin
-       (letrec*
-        ((loop_0
-          (|#%name|
-           loop
-           (lambda (ls_0)
-             (begin
-               (if (null? ls_0)
-                 #f
-                 (if (not (pair? ls_0))
-                   (begin-unsafe
-                    (raise-mismatch-error
-                     'memq
-                     "not a proper list: "
-                     orig-l_0))
-                   (if (eq? v_0 (car ls_0)) ls_0 (loop_0 (cdr ls_0))))))))))
-        (loop_0 orig-l_0))))))
-(define memv
-  (|#%name|
-   memv
-   (lambda (v_0 orig-l_0)
-     (begin
-       (letrec*
-        ((loop_0
-          (|#%name|
-           loop
-           (lambda (ls_0)
-             (begin
-               (if (null? ls_0)
-                 #f
-                 (if (not (pair? ls_0))
-                   (begin-unsafe
-                    (raise-mismatch-error
-                     'memv
-                     "not a proper list: "
-                     orig-l_0))
-                   (if (eqv? v_0 (car ls_0)) ls_0 (loop_0 (cdr ls_0))))))))))
-        (loop_0 orig-l_0))))))
-(define member
-  (let ((default_0
-         (|#%name|
-          member
-          (lambda (v_0 orig-l_0)
-            (begin
-              (letrec*
-               ((loop_0
-                 (|#%name|
-                  loop
-                  (lambda (ls_0)
-                    (begin
-                      (if (null? ls_0)
-                        #f
-                        (if (not (pair? ls_0))
-                          (begin-unsafe
-                           (raise-mismatch-error
-                            'member
-                            "not a proper list: "
-                            orig-l_0))
-                          (if (equal? v_0 (car ls_0))
-                            ls_0
-                            (loop_0 (cdr ls_0))))))))))
-               (loop_0 orig-l_0)))))))
-    (|#%name|
-     member
-     (case-lambda
-      ((v_0 orig-l_0) (begin (default_0 v_0 orig-l_0)))
-      ((v_0 orig-l_0 eq?_0)
-       (begin
-         (if (if (procedure? eq?_0) (procedure-arity-includes? eq?_0 2) #f)
-           (void)
-           (raise-argument-error
-            'member
-            "(procedure-arity-includes/c 2)"
-            eq?_0))
-         ((|#%name|
-           member
-           (lambda (v_1 orig-l_1)
-             (begin
-               (letrec*
-                ((loop_0
-                  (|#%name|
-                   loop
-                   (lambda (ls_0)
-                     (begin
-                       (if (null? ls_0)
-                         #f
-                         (if (not (pair? ls_0))
-                           (begin-unsafe
-                            (raise-mismatch-error
-                             'member
-                             "not a proper list: "
-                             orig-l_1))
-                           (if (|#%app| eq?_0 v_1 (car ls_0))
-                             ls_0
-                             (loop_0 (cdr ls_0))))))))))
-                (loop_0 orig-l_1)))))
-          v_0
-          orig-l_0)))))))
 (define-values
  (prop:keyword-impersonator keyword-impersonator? keyword-impersonator-ref)
  (make-struct-type-property 'keyword-impersonator))
@@ -2615,7 +2508,7 @@
 (define 1/unsafe-add-global-finalizer unsafe-add-global-finalizer)
 (define 1/malloc-immobile-cell malloc-immobile-cell)
 (define 1/free-immobile-cell free-immobile-cell)
-(define finish65
+(define finish57
   (make-struct-type-install-properties
    '(sandman)
    11
@@ -2642,7 +2535,7 @@
    #f
    11
    2047))
-(define effect_2951 (finish65 struct:sandman))
+(define effect_2951 (finish57 struct:sandman))
 (define sandman1.1
   (|#%name|
    sandman
@@ -3591,7 +3484,7 @@
                         (|#%app| rktio_free h_0)
                         (loop_0 #t))))))))))
          (loop_0 #f))))))
-(define finish321
+(define finish313
   (make-struct-type-install-properties
    '(exts)
    2
@@ -3612,7 +3505,7 @@
    #f
    2
    0))
-(define effect_2505 (finish321 struct:exts))
+(define effect_2505 (finish313 struct:exts))
 (define exts1.1
   (|#%name|
    exts
@@ -3884,7 +3777,7 @@
     (if (input-port-evt? p_0)
       (wrap-evt (|#%app| (input-port-evt-ref p_0) p_0) (lambda (v_0) p_0))
       (wrap-evt (|#%app| (output-port-evt-ref p_0) p_0) (lambda (v_0) p_0)))))
-(define finish336
+(define finish328
   (make-struct-type-install-properties
    '(core-port)
    7
@@ -3909,7 +3802,7 @@
    #f
    7
    124))
-(define effect_2337 (finish336 struct:core-port))
+(define effect_2337 (finish328 struct:core-port))
 (define create-core-port
   (|#%name|
    create-core-port
@@ -3940,7 +3833,7 @@
   (|#%name| set-core-port-offset! (record-mutator struct:core-port 5)))
 (define set-core-port-count!
   (|#%name| set-core-port-count! (record-mutator struct:core-port 6)))
-(define finish339
+(define finish331
   (make-struct-type-install-properties
    '(core-port-methods)
    5
@@ -3961,7 +3854,7 @@
    #f
    5
    0))
-(define effect_2309 (finish339 struct:core-port-methods.1))
+(define effect_2309 (finish331 struct:core-port-methods.1))
 (define core-port-methods1.1
   (|#%name|
    core-port-methods
@@ -4076,7 +3969,7 @@
    #f
    #f
    #f))
-(define finish346
+(define finish338
   (make-struct-type-install-properties
    '(direct)
    3
@@ -4097,7 +3990,7 @@
    #f
    3
    7))
-(define effect_2682 (finish346 struct:direct))
+(define effect_2682 (finish338 struct:direct))
 (define direct2.1
   (|#%name|
    direct
@@ -4113,7 +4006,7 @@
   (|#%name| set-direct-pos! (record-mutator struct:direct 1)))
 (define set-direct-end!
   (|#%name| set-direct-end! (record-mutator struct:direct 2)))
-(define finish348
+(define finish340
   (make-struct-type-install-properties
    '(location)
    5
@@ -4134,7 +4027,7 @@
    #f
    5
    31))
-(define effect_3131 (finish348 struct:location))
+(define effect_3131 (finish340 struct:location))
 (define location3.1
   (|#%name|
    location
@@ -4220,7 +4113,7 @@
                (if who3_0
                  (raise-argument-error who3_0 "input-port?" v4_0)
                  default_0)))))))))
-(define finish350
+(define finish342
   (make-struct-type-install-properties
    '(core-input-port)
    2
@@ -4271,7 +4164,7 @@
    #f
    2
    3))
-(define effect_2528 (finish350 struct:core-input-port))
+(define effect_2528 (finish342 struct:core-input-port))
 (define create-core-input-port
   (|#%name|
    create-core-input-port
@@ -4295,7 +4188,7 @@
   (|#%name|
    set-core-input-port-read-handler!
    (record-mutator struct:core-input-port 1)))
-(define finish353
+(define finish345
   (make-struct-type-install-properties
    '(core-input-port-methods)
    6
@@ -4316,7 +4209,7 @@
    #f
    6
    0))
-(define effect_2085 (finish353 struct:core-input-port-methods.1))
+(define effect_2085 (finish345 struct:core-input-port-methods.1))
 (define core-input-port-methods6.1
   (|#%name|
    core-input-port-methods
@@ -4539,7 +4432,7 @@
                (if who3_0
                  (raise-argument-error who3_0 "output-port?" v4_0)
                  default_0)))))))))
-(define finish365
+(define finish357
   (make-struct-type-install-properties
    '(core-output-port)
    4
@@ -4577,7 +4470,7 @@
    #f
    4
    15))
-(define effect_2808 (finish365 struct:core-output-port))
+(define effect_2808 (finish357 struct:core-output-port))
 (define create-core-output-port
   (|#%name|
    create-core-output-port
@@ -4615,7 +4508,7 @@
   (|#%name|
    set-core-output-port-display-handler!
    (record-mutator struct:core-output-port 3)))
-(define finish369
+(define finish361
   (make-struct-type-install-properties
    '(core-output-port-methods)
    4
@@ -4636,7 +4529,7 @@
    #f
    4
    0))
-(define effect_2050 (finish369 struct:core-output-port-methods.1))
+(define effect_2050 (finish361 struct:core-output-port-methods.1))
 (define core-output-port-methods6.1
   (|#%name|
    core-output-port-methods
@@ -4786,7 +4679,7 @@
              (if (evt? v_0)
                (values #f (replace-evt v_0 self-evt_0))
                (values (list v_0) #f)))))))))
-(define finish380
+(define finish372
   (make-struct-type-install-properties
    '(write-evt)
    1
@@ -4813,7 +4706,7 @@
    #f
    1
    0))
-(define effect_2493 (finish380 struct:write-evt))
+(define effect_2493 (finish372 struct:write-evt))
 (define write-evt7.1
   (|#%name|
    write-evt
@@ -4858,7 +4751,7 @@
    #f
    #f
    #f))
-(define finish384
+(define finish376
   (make-struct-type-install-properties
    '(utf-8-state)
    3
@@ -4879,7 +4772,7 @@
    #f
    3
    0))
-(define effect_2751 (finish384 struct:utf-8-state))
+(define effect_2751 (finish376 struct:utf-8-state))
 (define utf-8-state1.1
   (|#%name|
    utf-8-state
@@ -6685,7 +6578,7 @@
         (if old-offset_0
           (set-core-port-offset! in_0 (+ amt_0 old-offset_0))
           (void))))))
-(define finish464
+(define finish456
   (make-struct-type-install-properties
    '(commit-manager)
    3
@@ -6706,7 +6599,7 @@
    #f
    3
    0))
-(define effect_2594 (finish464 struct:commit-manager))
+(define effect_2594 (finish456 struct:commit-manager))
 (define commit-manager1.1
   (|#%name|
    commit-manager
@@ -6776,7 +6669,7 @@
          s
          'commit-manager
          'thread))))))
-(define finish470
+(define finish462
   (make-struct-type-install-properties
    '(commit-request)
    5
@@ -6797,7 +6690,7 @@
    #f
    5
    0))
-(define effect_2646 (finish470 struct:commit-request))
+(define effect_2646 (finish462 struct:commit-request))
 (define commit-request2.1
   (|#%name|
    commit-request
@@ -6901,7 +6794,7 @@
          s
          'commit-request
          'result-ch))))))
-(define finish478
+(define finish470
   (make-struct-type-install-properties
    '(commit-response)
    2
@@ -6922,7 +6815,7 @@
    #f
    2
    0))
-(define effect_2529 (finish478 struct:commit-response))
+(define effect_2529 (finish470 struct:commit-response))
 (define commit-response3.1
   (|#%name|
    commit-response
@@ -7219,7 +7112,7 @@
                  (sync result-ch_0))
                (unsafe-start-atomic))))
          (lambda () (semaphore-post abandon-evt_0)))))))
-(define finish497
+(define finish489
   (make-struct-type-install-properties
    '(commit-input-port)
    2
@@ -7240,7 +7133,7 @@
    #f
    2
    3))
-(define effect_2802 (finish497 struct:commit-input-port))
+(define effect_2802 (finish489 struct:commit-input-port))
 (define create-commit-input-port
   (|#%name|
    create-commit-input-port
@@ -7264,7 +7157,7 @@
   (|#%name|
    set-commit-input-port-commit-manager!
    (record-mutator struct:commit-input-port 1)))
-(define finish500
+(define finish492
   (make-struct-type-install-properties
    '(commit-input-port-methods)
    0
@@ -7285,7 +7178,7 @@
    #f
    0
    0))
-(define effect_3199 (finish500 struct:commit-input-port-methods.1))
+(define effect_3199 (finish492 struct:commit-input-port-methods.1))
 (define commit-input-port-methods5.1
   (|#%name|
    commit-input-port-methods
@@ -7439,7 +7332,7 @@
            (begin0
              (begin (temp3.1$3 d_0) (temp4.1$2 d_0))
              (unsafe-end-atomic))))))))
-(define finish512
+(define finish504
   (make-struct-type-install-properties
    '(pipe-data)
    16
@@ -7460,7 +7353,7 @@
    #f
    16
    65534))
-(define effect_3021 (finish512 struct:pipe-data))
+(define effect_3021 (finish504 struct:pipe-data))
 (define create-pipe-data
   (|#%name|
    create-pipe-data
@@ -7541,7 +7434,7 @@
   (|#%name|
    set-pipe-data-write-ready-evt!
    (record-mutator struct:pipe-data 15)))
-(define finish515
+(define finish507
   (make-struct-type-install-properties
    '(pipe-data-methods)
    0
@@ -7562,7 +7455,7 @@
    #f
    0
    0))
-(define effect_2537 (finish515 struct:pipe-data-methods.1))
+(define effect_2537 (finish507 struct:pipe-data-methods.1))
 (define pipe-data-methods10.1
   (|#%name|
    pipe-data-methods
@@ -7675,7 +7568,7 @@
          (void))))))
 (define make-ref (lambda (v_0) (make-weak-box v_0)))
 (define ref-value (lambda (r_0) (weak-box-value r_0)))
-(define finish519
+(define finish511
   (make-struct-type-install-properties
    '(pipe-input-port)
    1
@@ -7696,7 +7589,7 @@
    #f
    1
    1))
-(define effect_2318 (finish519 struct:pipe-input-port))
+(define effect_2318 (finish511 struct:pipe-input-port))
 (define create-pipe-input-port
   (|#%name|
    create-pipe-input-port
@@ -7708,7 +7601,7 @@
   (|#%name| pipe-input-port-d (record-accessor struct:pipe-input-port 0)))
 (define set-pipe-input-port-d!
   (|#%name| set-pipe-input-port-d! (record-mutator struct:pipe-input-port 0)))
-(define finish522
+(define finish514
   (make-struct-type-install-properties
    '(pipe-input-port-methods)
    0
@@ -7729,7 +7622,7 @@
    #f
    0
    0))
-(define effect_2335 (finish522 struct:pipe-input-port-methods.1))
+(define effect_2335 (finish514 struct:pipe-input-port-methods.1))
 (define pipe-input-port-methods15.1
   (|#%name|
    pipe-input-port-methods
@@ -8071,7 +7964,7 @@
                      (set-direct-pos! b_0 (direct-end b_0)))))
                (void))
              (temp2.1$2 o_0))))))))
-(define finish541
+(define finish533
   (make-struct-type-install-properties
    '(pipe-output-port)
    1
@@ -8092,7 +7985,7 @@
    #f
    1
    1))
-(define effect_2635 (finish541 struct:pipe-output-port))
+(define effect_2635 (finish533 struct:pipe-output-port))
 (define create-pipe-output-port
   (|#%name|
    create-pipe-output-port
@@ -8106,7 +7999,7 @@
   (|#%name|
    set-pipe-output-port-d!
    (record-mutator struct:pipe-output-port 0)))
-(define finish544
+(define finish536
   (make-struct-type-install-properties
    '(pipe-output-port-methods)
    0
@@ -8127,7 +8020,7 @@
    #f
    0
    0))
-(define effect_3193 (finish544 struct:pipe-output-port-methods.1))
+(define effect_3193 (finish536 struct:pipe-output-port-methods.1))
 (define pipe-output-port-methods20.1
   (|#%name|
    pipe-output-port-methods
@@ -8683,7 +8576,7 @@
        (make-pipe_0 limit_0 input-name_0 output-name26_0))
       ((limit_0 input-name25_0) (make-pipe_0 limit_0 input-name25_0 'pipe))
       ((limit24_0) (make-pipe_0 limit24_0 'pipe 'pipe))))))
-(define finish580
+(define finish572
   (make-struct-type-install-properties
    '(pipe-write-poller)
    1
@@ -8734,7 +8627,7 @@
    #f
    1
    0))
-(define effect_2599 (finish580 struct:pipe-write-poller))
+(define effect_2599 (finish572 struct:pipe-write-poller))
 (define pipe-write-poller27.1
   (|#%name|
    pipe-write-poller
@@ -8768,7 +8661,7 @@
          s
          'pipe-write-poller
          'd))))))
-(define finish585
+(define finish577
   (make-struct-type-install-properties
    '(pipe-read-poller)
    1
@@ -8819,7 +8712,7 @@
    #f
    1
    0))
-(define effect_2907 (finish585 struct:pipe-read-poller))
+(define effect_2907 (finish577 struct:pipe-read-poller))
 (define pipe-read-poller28.1
   (|#%name|
    pipe-read-poller
@@ -8853,7 +8746,7 @@
          s
          'pipe-read-poller
          'd))))))
-(define finish589
+(define finish581
   (make-struct-type-install-properties
    '(peek-via-read-input-port)
    5
@@ -8874,7 +8767,7 @@
    #f
    5
    31))
-(define effect_2578 (finish589 struct:peek-via-read-input-port))
+(define effect_2578 (finish581 struct:peek-via-read-input-port))
 (define create-peek-via-read-input-port
   (|#%name|
    create-peek-via-read-input-port
@@ -8927,7 +8820,7 @@
   (|#%name|
    set-peek-via-read-input-port-buffer-mode!
    (record-mutator struct:peek-via-read-input-port 4)))
-(define finish592
+(define finish584
   (make-struct-type-install-properties
    '(peek-via-read-input-port-methods)
    1
@@ -8948,7 +8841,7 @@
    #f
    1
    0))
-(define effect_2499 (finish592 struct:peek-via-read-input-port-methods.1))
+(define effect_2499 (finish584 struct:peek-via-read-input-port-methods.1))
 (define peek-via-read-input-port-methods10.1
   (|#%name|
    peek-via-read-input-port-methods
@@ -9633,7 +9526,7 @@
                           (current-continuation-marks)))))))
                  (void))))
            (void)))))))
-(define finish628
+(define finish620
   (make-struct-type-install-properties
    '(fd-input-port)
    3
@@ -9659,7 +9552,7 @@
    #f
    3
    7))
-(define effect_1979 (finish628 struct:fd-input-port))
+(define effect_1979 (finish620 struct:fd-input-port))
 (define create-fd-input-port
   (|#%name|
    create-fd-input-port
@@ -9687,7 +9580,7 @@
   (|#%name|
    set-fd-input-port-custodian-reference!
    (record-mutator struct:fd-input-port 2)))
-(define finish631
+(define finish623
   (make-struct-type-install-properties
    '(fd-input-port-methods)
    2
@@ -9708,7 +9601,7 @@
    #f
    2
    0))
-(define effect_2420 (finish631 struct:fd-input-port-methods.1))
+(define effect_2420 (finish623 struct:fd-input-port-methods.1))
 (define fd-input-port-methods6.1
   (|#%name|
    fd-input-port-methods
@@ -9941,7 +9834,7 @@
                 p16_0
                 (register-fd-close cust_0 fd_0 fd-refcount_0 #f p16_0))
                (finish-port/count p16_0)))))))))
-(define finish647
+(define finish639
   (make-struct-type-install-properties
    '(fd-output-port)
    8
@@ -9991,7 +9884,7 @@
    #f
    8
    255))
-(define effect_2896 (finish647 struct:fd-output-port))
+(define effect_2896 (finish639 struct:fd-output-port))
 (define create-fd-output-port
   (|#%name|
    create-fd-output-port
@@ -10053,7 +9946,7 @@
   (|#%name|
    set-fd-output-port-custodian-reference!
    (record-mutator struct:fd-output-port 7)))
-(define finish654
+(define finish646
   (make-struct-type-install-properties
    '(fd-output-port-methods)
    2
@@ -10074,7 +9967,7 @@
    #f
    2
    0))
-(define effect_1955 (finish654 struct:fd-output-port-methods.1))
+(define effect_1955 (finish646 struct:fd-output-port-methods.1))
 (define fd-output-port-methods26.1
   (|#%name|
    fd-output-port-methods
@@ -10654,7 +10547,7 @@
                      (format-rktio-message 'file-position r_0 base-msg_0)))
                 (|#%app| exn:fail app_0 (current-continuation-marks)))))))
         (void)))))
-(define finish682
+(define finish674
   (make-struct-type-install-properties
    '(fd-evt)
    3
@@ -10725,7 +10618,7 @@
    #f
    3
    4))
-(define effect_2660 (finish682 struct:fd-evt))
+(define effect_2660 (finish674 struct:fd-evt))
 (define fd-evt44.1
   (|#%name|
    fd-evt
@@ -10793,7 +10686,7 @@
          v
          'fd-evt
          'closed))))))
-(define finish691
+(define finish683
   (make-struct-type-install-properties
    '(rktio-fd-flushed-evt)
    1
@@ -10838,7 +10731,7 @@
    #f
    1
    0))
-(define effect_2170 (finish691 struct:rktio-fd-flushed-evt))
+(define effect_2170 (finish683 struct:rktio-fd-flushed-evt))
 (define rktio-fd-flushed-evt45.1
   (|#%name|
    rktio-fd-flushed-evt
@@ -11585,7 +11478,7 @@
                                     (loop_0 (fx+ i_0 1))))
                                 (loop_0 (fx+ i_0 1)))))))))))
                  (loop_0 pos_0))))))))))
-(define finish704
+(define finish696
   (make-struct-type-install-properties
    '(progress-evt)
    2
@@ -11609,7 +11502,7 @@
    #f
    2
    0))
-(define effect_2490 (finish704 struct:progress-evt))
+(define effect_2490 (finish696 struct:progress-evt))
 (define progress-evt1.1
   (|#%name|
    progress-evt
@@ -14908,7 +14801,7 @@
       (begin
         (unsafe-bytes-set! out-bstr_0 j_0 lo_0)
         (unsafe-bytes-set! out-bstr_0 (+ j_0 1) hi_0)))))
-(define finish732
+(define finish724
   (make-struct-type-install-properties
    '(utf-8-converter)
    2
@@ -14929,7 +14822,7 @@
    #f
    2
    0))
-(define effect_2402 (finish732 struct:utf-8-converter))
+(define effect_2402 (finish724 struct:utf-8-converter))
 (define utf-8-converter1.1
   (|#%name|
    utf-8-converter
@@ -15842,7 +15735,7 @@
                                    (done_0 'error)))
                                (continue_0 v_0 (+ i_0 2)))))))))))))))
         (loop_0 in-start20_0 out-start23_0))))))
-(define finish783
+(define finish775
   (make-struct-type-install-properties
    '(bytes-converter)
    2
@@ -15863,7 +15756,7 @@
    #f
    2
    3))
-(define effect_2496 (finish783 struct:bytes-converter))
+(define effect_2496 (finish775 struct:bytes-converter))
 (define bytes-converter1.1
   (|#%name|
    bytes-converter
@@ -16719,7 +16612,7 @@
                 (args (raise-binding-result-arity-error 4 args))))
               (void)))
           (check-not-unsafe-undefined bstr_0 'bstr_119))))))
-(define finish808
+(define finish800
   (make-struct-type-install-properties
    '(cache)
    4
@@ -16740,7 +16633,7 @@
    #f
    4
    15))
-(define effect_2561 (finish808 struct:cache))
+(define effect_2561 (finish800 struct:cache))
 (define cache1.1
   (|#%name|
    cache
@@ -17093,7 +16986,7 @@
        (bytes->string/locale_0 in-bstr_0 err-char_0 start6_0 unsafe-undefined))
       ((in-bstr_0 err-char5_0)
        (bytes->string/locale_0 in-bstr_0 err-char5_0 0 unsafe-undefined))))))
-(define finish815
+(define finish807
   (make-struct-type-install-properties
    '(path)
    2
@@ -17139,7 +17032,7 @@
    #f
    2
    0))
-(define effect_2995 (finish815 struct:path))
+(define effect_2995 (finish807 struct:path))
 (define path1.1
   (|#%name|
    path
@@ -18395,7 +18288,7 @@
      (case-lambda
       ((bstr_0) (begin (open-input-bytes_0 bstr_0 'string)))
       ((bstr_0 name1_0) (open-input-bytes_0 bstr_0 name1_0))))))
-(define finish824
+(define finish816
   (make-struct-type-install-properties
    '(bytes-input-port)
    3
@@ -18416,7 +18309,7 @@
    #f
    3
    7))
-(define effect_2847 (finish824 struct:bytes-input-port))
+(define effect_2847 (finish816 struct:bytes-input-port))
 (define create-bytes-input-port
   (|#%name|
    create-bytes-input-port
@@ -18444,7 +18337,7 @@
   (|#%name|
    set-bytes-input-port-alt-pos!
    (record-mutator struct:bytes-input-port 2)))
-(define finish827
+(define finish819
   (make-struct-type-install-properties
    '(bytes-input-port-methods)
    0
@@ -18465,7 +18358,7 @@
    #f
    0
    0))
-(define effect_2130 (finish827 struct:bytes-input-port-methods.1))
+(define effect_2130 (finish819 struct:bytes-input-port-methods.1))
 (define bytes-input-port-methods4.1
   (|#%name|
    bytes-input-port-methods
@@ -18675,7 +18568,7 @@
       bstr_0
       0
       #f))))
-(define finish835
+(define finish827
   (make-struct-type-install-properties
    '(bytes-output-port)
    3
@@ -18696,7 +18589,7 @@
    #f
    3
    7))
-(define effect_2052 (finish835 struct:bytes-output-port))
+(define effect_2052 (finish827 struct:bytes-output-port))
 (define create-bytes-output-port
   (|#%name|
    create-bytes-output-port
@@ -18728,7 +18621,7 @@
   (|#%name|
    set-bytes-output-port-max-pos!
    (record-mutator struct:bytes-output-port 2)))
-(define finish838
+(define finish830
   (make-struct-type-install-properties
    '(bytes-output-port-methods)
    2
@@ -18749,7 +18642,7 @@
    #f
    2
    0))
-(define effect_2430 (finish838 struct:bytes-output-port-methods.1))
+(define effect_2430 (finish830 struct:bytes-output-port-methods.1))
 (define bytes-output-port-methods8.1
   (|#%name|
    bytes-output-port-methods
@@ -19181,7 +19074,7 @@
                 (if (string? str_0)
                   (1/string->bytes/utf-8 str_0 #f start_0 end_0)
                   (subbytes str_0 start_0 end_0)))))))))))
-(define finish854
+(define finish846
   (make-struct-type-install-properties
    '(max-output-port)
    2
@@ -19202,7 +19095,7 @@
    #f
    2
    3))
-(define effect_3019 (finish854 struct:max-output-port))
+(define effect_3019 (finish846 struct:max-output-port))
 (define create-max-output-port
   (|#%name|
    create-max-output-port
@@ -19222,7 +19115,7 @@
   (|#%name|
    set-max-output-port-max-length!
    (record-mutator struct:max-output-port 1)))
-(define finish857
+(define finish849
   (make-struct-type-install-properties
    '(max-output-port-methods)
    0
@@ -19243,7 +19136,7 @@
    #f
    0
    0))
-(define effect_2933 (finish857 struct:max-output-port-methods.1))
+(define effect_2933 (finish849 struct:max-output-port-methods.1))
 (define max-output-port-methods1.1
   (|#%name|
    max-output-port-methods
@@ -20144,7 +20037,7 @@
   (lambda (mode_0)
     (let ((or-part_0 (eq? mode_0 0)))
       (if or-part_0 or-part_0 (eq? mode_0 1)))))
-(define finish871
+(define finish863
   (make-struct-type-install-properties
    '(nowhere-output-port)
    0
@@ -20165,7 +20058,7 @@
    #f
    0
    0))
-(define effect_2267 (finish871 struct:nowhere-output-port))
+(define effect_2267 (finish863 struct:nowhere-output-port))
 (define create-nowhere-output-port
   (|#%name|
    create-nowhere-output-port
@@ -20175,7 +20068,7 @@
   (|#%name|
    nowhere-output-port?
    (record-predicate struct:nowhere-output-port)))
-(define finish874
+(define finish866
   (make-struct-type-install-properties
    '(nowhere-output-port-methods)
    0
@@ -20196,7 +20089,7 @@
    #f
    0
    0))
-(define effect_2301 (finish874 struct:nowhere-output-port-methods.1))
+(define effect_2301 (finish866 struct:nowhere-output-port-methods.1))
 (define nowhere-output-port-methods1.1
   (|#%name|
    nowhere-output-port-methods
@@ -20422,7 +20315,7 @@
                               #f)
                             fuel_1)))))))))))))
      (quick-no-graph?_0 v_0 fuel_0))))
-(define finish891
+(define finish883
   (make-struct-type-install-properties
    '(as-constructor)
    1
@@ -20443,7 +20336,7 @@
    #f
    1
    0))
-(define effect_2645 (finish891 struct:as-constructor))
+(define effect_2645 (finish883 struct:as-constructor))
 (define as-constructor1.1
   (|#%name|
    as-constructor
@@ -23420,7 +23313,7 @@
           (if (letter-drive-start? s_0 (unsafe-bytes-length s_0))
             (just-separators-after? s_0 2)
             #f))))))
-(define finish971
+(define finish963
   (make-struct-type-install-properties
    '(starting-point)
    7
@@ -23441,7 +23334,7 @@
    #f
    7
    0))
-(define effect_2521 (finish971 struct:starting-point))
+(define effect_2521 (finish963 struct:starting-point))
 (define starting-point7.1
   (|#%name|
    starting-point
@@ -25411,7 +25304,7 @@
 (define port-number? (lambda (v_0) (if (fixnum? v_0) (<= 1 v_0 65535) #f)))
 (define listen-port-number?
   (lambda (v_0) (if (fixnum? v_0) (<= 0 v_0 65535) #f)))
-(define finish1013
+(define finish1005
   (make-struct-type-install-properties
    '(security-guard)
    4
@@ -25432,7 +25325,7 @@
    #f
    4
    0))
-(define effect_2369 (finish1013 struct:security-guard))
+(define effect_2369 (finish1005 struct:security-guard))
 (define security-guard1.1
   (|#%name|
    security-guard
@@ -29871,7 +29764,7 @@
       (bytes->immutable-bytes
        (1/string->bytes/locale (string-foldcase (1/bytes->string/locale k_0))))
       k_0)))
-(define finish1098
+(define finish1090
   (make-struct-type-install-properties
    '(environment-variables)
    1
@@ -29892,7 +29785,7 @@
    #f
    1
    1))
-(define effect_2329 (finish1098 struct:environment-variables))
+(define effect_2329 (finish1090 struct:environment-variables))
 (define environment-variables1.1
   (|#%name|
    environment-variables
@@ -31605,7 +31498,7 @@
            #f))))))
 (define adjust-path
   (lambda (p_0) (if (is-path? p_0) (relative-to-user-directory p_0) p_0)))
-(define finish1175
+(define finish1167
   (make-struct-type-install-properties
    '(logger)
    11
@@ -31626,7 +31519,7 @@
    #f
    11
    376))
-(define effect_2687 (finish1175 struct:logger))
+(define effect_2687 (finish1167 struct:logger))
 (define logger1.1
   (|#%name|
    logger
@@ -32076,7 +31969,7 @@
      (loop_0 filters_0 'none))))
 (define level->user-representation
   (lambda (lvl_0) (if (eq? lvl_0 'none) #f lvl_0)))
-(define finish1200
+(define finish1192
   (make-struct-type-install-properties
    '(queue)
    2
@@ -32097,7 +31990,7 @@
    #f
    2
    3))
-(define effect_2998 (finish1200 struct:queue))
+(define effect_2998 (finish1192 struct:queue))
 (define queue1.1
   (|#%name|
    queue
@@ -32110,7 +32003,7 @@
   (|#%name| set-queue-start! (record-mutator struct:queue 0)))
 (define set-queue-end!
   (|#%name| set-queue-end! (record-mutator struct:queue 1)))
-(define finish1202
+(define finish1194
   (make-struct-type-install-properties
    '(node)
    3
@@ -32131,7 +32024,7 @@
    #f
    3
    6))
-(define effect_2547 (finish1202 struct:node))
+(define effect_2547 (finish1194 struct:node))
 (define node2.1
   (|#%name|
    node
@@ -32174,7 +32067,7 @@
       (if (node-next n_0)
         (let ((app_0 (node-next n_0))) (set-node-prev! app_0 (node-prev n_0)))
         (set-queue-end! q_0 (node-prev n_0))))))
-(define finish1207
+(define finish1199
   (make-struct-type-install-properties
    '(log-receiver)
    1
@@ -32195,7 +32088,7 @@
    #f
    1
    0))
-(define effect_2969 (finish1207 struct:log-receiver))
+(define effect_2969 (finish1199 struct:log-receiver))
 (define log-receiver1.1
   (|#%name|
    log-receiver
@@ -32232,7 +32125,7 @@
 (define-values
  (prop:receiver-send receiver-send? receiver-send-ref)
  (make-struct-type-property 'receiver-send))
-(define finish1211
+(define finish1203
   (make-struct-type-install-properties
    '(log-receiver)
    3
@@ -32307,7 +32200,7 @@
    #f
    3
    0))
-(define effect_2324 (finish1211 struct:queue-log-receiver))
+(define effect_2324 (finish1203 struct:queue-log-receiver))
 (define queue-log-receiver2.1
   (|#%name|
    queue-log-receiver
@@ -32413,7 +32306,7 @@
           (begin-unsafe (not (queue-start q_0))))
       (set-box! (queue-log-receiver-backref lr_0) lr_0)
       (void))))
-(define finish1223
+(define finish1215
   (make-struct-type-install-properties
    '(stdio-log-receiver)
    2
@@ -32469,7 +32362,7 @@
    #f
    2
    0))
-(define effect_2591 (finish1223 struct:stdio-log-receiver))
+(define effect_2591 (finish1215 struct:stdio-log-receiver))
 (define stdio-log-receiver3.1
   (|#%name|
    stdio-log-receiver
@@ -32559,7 +32452,7 @@
      args_0
      'make-stdio-log-receiver
      1)))
-(define finish1228
+(define finish1220
   (make-struct-type-install-properties
    '(syslog-log-receiver)
    2
@@ -32604,7 +32497,7 @@
    #f
    2
    0))
-(define effect_2288 (finish1228 struct:syslog-log-receiver))
+(define effect_2288 (finish1220 struct:syslog-log-receiver))
 (define syslog-log-receiver4.1
   (|#%name|
    syslog-log-receiver
@@ -33525,7 +33418,7 @@
                       (void)))))))))
          (loop_0 logger_0))
         (void)))))
-(define finish1270
+(define finish1262
   (make-struct-type-install-properties
    '(filesystem-change-evt)
    2
@@ -33571,7 +33464,7 @@
    #f
    2
    3))
-(define effect_3368 (finish1270 struct:fs-change-evt))
+(define effect_3368 (finish1262 struct:fs-change-evt))
 (define fs-change-evt1.1
   (|#%name|
    fs-change-evt
@@ -34027,7 +33920,7 @@
                        (loop_0 start_0)))))
                 (let ((bstr_0 (make-bytes sz_0)))
                   (begin (|#%app| final_0 p_0 bstr_0) bstr_0))))))))))
-(define finish1282
+(define finish1274
   (make-struct-type-install-properties
    '(subprocess)
    3
@@ -34070,7 +33963,7 @@
    #f
    3
    3))
-(define effect_2289 (finish1282 struct:subprocess))
+(define effect_2289 (finish1274 struct:subprocess))
 (define make-subprocess
   (|#%name|
    make-subprocess
@@ -34216,11 +34109,11 @@
                 'subprocess
                 "(or/c (and/c output-port? file-stream-port?) #f 'stdout)"
                 stderr_0))
-             (let ((lr1289 unsafe-undefined)
+             (let ((lr1281 unsafe-undefined)
                    (group_0 unsafe-undefined)
                    (command_0 unsafe-undefined)
                    (exact/args_0 unsafe-undefined))
-               (set! lr1289
+               (set! lr1281
                  (call-with-values
                   (lambda ()
                     (if (path-string? group/command_0)
@@ -34275,9 +34168,9 @@
                    ((group_1 command_1 exact/args_1)
                     (vector group_1 command_1 exact/args_1))
                    (args (raise-binding-result-arity-error 3 args)))))
-               (set! group_0 (unsafe-vector*-ref lr1289 0))
-               (set! command_0 (unsafe-vector*-ref lr1289 1))
-               (set! exact/args_0 (unsafe-vector*-ref lr1289 2))
+               (set! group_0 (unsafe-vector*-ref lr1281 0))
+               (set! command_0 (unsafe-vector*-ref lr1281 1))
+               (set! exact/args_0 (unsafe-vector*-ref lr1281 2))
                (call-with-values
                 (lambda ()
                   (if (if (pair? exact/args_0)
@@ -34904,7 +34797,7 @@
 (define raise-network-option-error
   (lambda (who_0 mode_0 v_0)
     (raise-network-error who_0 v_0 (string-append mode_0 "sockopt failed"))))
-(define finish1321
+(define finish1313
   (make-struct-type-install-properties
    '(tcp-input-port)
    1
@@ -34931,7 +34824,7 @@
    #f
    1
    1))
-(define effect_2486 (finish1321 struct:tcp-input-port))
+(define effect_2486 (finish1313 struct:tcp-input-port))
 (define create-tcp-input-port
   (|#%name|
    create-tcp-input-port
@@ -34945,7 +34838,7 @@
   (|#%name|
    set-tcp-input-port-abandon?!
    (record-mutator struct:tcp-input-port 0)))
-(define finish1324
+(define finish1316
   (make-struct-type-install-properties
    '(tcp-input-port-methods)
    0
@@ -34966,7 +34859,7 @@
    #f
    0
    0))
-(define effect_2506 (finish1324 struct:tcp-input-port-methods.1))
+(define effect_2506 (finish1316 struct:tcp-input-port-methods.1))
 (define tcp-input-port-methods1.1
   (|#%name|
    tcp-input-port-methods
@@ -35081,7 +34974,7 @@
                    #f
                    #f)))
              (finish-fd-input-port.1 unsafe-undefined temp80_0))))))))
-(define finish1338
+(define finish1330
   (make-struct-type-install-properties
    '(tcp-output-port)
    1
@@ -35108,7 +35001,7 @@
    #f
    1
    1))
-(define effect_2179 (finish1338 struct:tcp-output-port))
+(define effect_2179 (finish1330 struct:tcp-output-port))
 (define create-tcp-output-port
   (|#%name|
    create-tcp-output-port
@@ -35124,7 +35017,7 @@
   (|#%name|
    set-tcp-output-port-abandon?!
    (record-mutator struct:tcp-output-port 0)))
-(define finish1341
+(define finish1333
   (make-struct-type-install-properties
    '(tcp-output-port-methods)
    0
@@ -35145,7 +35038,7 @@
    #f
    0
    0))
-(define effect_2820 (finish1341 struct:tcp-output-port-methods.1))
+(define effect_2820 (finish1333 struct:tcp-output-port-methods.1))
 (define tcp-output-port-methods7.1
   (|#%name|
    tcp-output-port-methods
@@ -35281,7 +35174,7 @@
            (if (tcp-output-port? cp_0)
              (begin (set-tcp-output-port-abandon?! cp_0 #t) (close-port p_0))
              (void))))))))
-(define finish1353
+(define finish1345
   (make-struct-type-install-properties
    '(rktio-evt)
    2
@@ -35316,7 +35209,7 @@
    #f
    2
    0))
-(define effect_1868 (finish1353 struct:rktio-evt))
+(define effect_1868 (finish1345 struct:rktio-evt))
 (define rktio-evt1.1
   (|#%name|
    rktio-evt
@@ -35472,7 +35365,7 @@
       (void))))
 (define address-init!
   (lambda () (unsafe-place-local-set! cell.1$3 (make-will-executor))))
-(define finish1359
+(define finish1351
   (make-struct-type-install-properties
    '(connect-progress)
    2
@@ -35493,7 +35386,7 @@
    #f
    2
    3))
-(define effect_2319 (finish1359 struct:connect-progress))
+(define effect_2319 (finish1351 struct:connect-progress))
 (define connect-progress1.1
   (|#%name|
    connect-progress
@@ -35845,7 +35738,7 @@
           (fd-semaphore-update! fd_0 'remove)
           (set-connect-progress-trying-fd! conn-prog_0 #f))
         (void)))))
-(define finish1364
+(define finish1356
   (make-struct-type-install-properties
    '(tcp-listener)
    3
@@ -35869,7 +35762,7 @@
    #f
    3
    0))
-(define effect_2347 (finish1364 struct:tcp-listener))
+(define effect_2347 (finish1356 struct:tcp-listener))
 (define tcp-listener1.1
   (|#%name|
    tcp-listener
@@ -36225,7 +36118,7 @@
            (void)
            (raise-argument-error 'tcp-accept-evt "tcp-listener?" listener_0))
          (accept-evt6.1 listener_0))))))
-(define finish1374
+(define finish1366
   (make-struct-type-install-properties
    '(tcp-accept-evt)
    1
@@ -36313,7 +36206,7 @@
    #f
    1
    0))
-(define effect_2608 (finish1374 struct:accept-evt))
+(define effect_2608 (finish1366 struct:accept-evt))
 (define accept-evt6.1
   (|#%name|
    accept-evt
@@ -36396,7 +36289,7 @@
                    v_0))))))
           (for-loop_0 0 0))))
       (args (raise-binding-result-arity-error 2 args))))))
-(define finish1379
+(define finish1371
   (make-struct-type-install-properties
    '(udp)
    3
@@ -36410,7 +36303,7 @@
    'udp))
 (define struct:udp
   (make-record-type-descriptor* 'udp #f (|#%nongenerative-uid| udp) #f #f 3 7))
-(define effect_2743 (finish1379 struct:udp))
+(define effect_2743 (finish1371 struct:udp))
 (define udp1.1
   (|#%name|
    udp
@@ -37554,7 +37447,7 @@
                     who59_0
                     u60_0)))))))
           (loop_0)))))))
-(define finish1395
+(define finish1387
   (make-struct-type-install-properties
    '(udp-send-evt)
    2
@@ -37599,7 +37492,7 @@
    #f
    2
    0))
-(define effect_2114 (finish1395 struct:udp-sending-evt))
+(define effect_2114 (finish1387 struct:udp-sending-evt))
 (define udp-sending-evt66.1
   (|#%name|
    udp-sending-evt
@@ -37611,7 +37504,7 @@
   (|#%name| udp-send-evt-u (record-accessor struct:udp-sending-evt 0)))
 (define udp-sending-evt-try
   (|#%name| udp-send-evt-try (record-accessor struct:udp-sending-evt 1)))
-(define finish1398
+(define finish1390
   (make-struct-type-install-properties
    '(udp-send-ready-evt)
    0
@@ -37632,7 +37525,7 @@
    #f
    0
    0))
-(define effect_2524 (finish1398 struct:udp-sending-ready-evt))
+(define effect_2524 (finish1390 struct:udp-sending-ready-evt))
 (define udp-sending-ready-evt67.1
   (|#%name|
    udp-sending-ready-evt
@@ -37943,7 +37836,7 @@
           (loop_0)))))))
 (define cell.1$2 (unsafe-make-place-local #vu8()))
 (define cell.2 (unsafe-make-place-local ""))
-(define finish1402
+(define finish1394
   (make-struct-type-install-properties
    '(udp-receive-evt)
    2
@@ -37993,7 +37886,7 @@
    #f
    2
    0))
-(define effect_2638 (finish1402 struct:udp-receiving-evt))
+(define effect_2638 (finish1394 struct:udp-receiving-evt))
 (define udp-receiving-evt39.1
   (|#%name|
    udp-receiving-evt
@@ -38005,7 +37898,7 @@
   (|#%name| udp-receive-evt-u (record-accessor struct:udp-receiving-evt 0)))
 (define udp-receiving-evt-try
   (|#%name| udp-receive-evt-try (record-accessor struct:udp-receiving-evt 1)))
-(define finish1405
+(define finish1397
   (make-struct-type-install-properties
    '(udp-receive-ready-evt)
    0
@@ -38026,7 +37919,7 @@
    #f
    0
    0))
-(define effect_2865 (finish1405 struct:udp-receiving-ready-evt))
+(define effect_2865 (finish1397 struct:udp-receiving-ready-evt))
 (define udp-receiving-ready-evt40.1
   (|#%name|
    udp-receiving-ready-evt
diff --git a/racket/src/cs/schemified/schemify.scm b/racket/src/cs/schemified/schemify.scm
index 2bbac558c3..fd8ce91c05 100644
--- a/racket/src/cs/schemified/schemify.scm
+++ b/racket/src/cs/schemified/schemify.scm
@@ -12,113 +12,6 @@
 (define fixnum-for-every-system?
   (lambda (v_0)
     (if (fixnum? v_0) (if (fx>= v_0 -536870912) (fx<= v_0 536870911) #f) #f)))
-(define bad-list$1
-  (|#%name|
-   bad-list
-   (lambda (who_0 orig-l_0)
-     (begin (raise-mismatch-error who_0 "not a proper list: " orig-l_0)))))
-(define memq
-  (|#%name|
-   memq
-   (lambda (v_0 orig-l_0)
-     (begin
-       (letrec*
-        ((loop_0
-          (|#%name|
-           loop
-           (lambda (ls_0)
-             (begin
-               (if (null? ls_0)
-                 #f
-                 (if (not (pair? ls_0))
-                   (begin-unsafe
-                    (raise-mismatch-error
-                     'memq
-                     "not a proper list: "
-                     orig-l_0))
-                   (if (eq? v_0 (car ls_0)) ls_0 (loop_0 (cdr ls_0))))))))))
-        (loop_0 orig-l_0))))))
-(define memv
-  (|#%name|
-   memv
-   (lambda (v_0 orig-l_0)
-     (begin
-       (letrec*
-        ((loop_0
-          (|#%name|
-           loop
-           (lambda (ls_0)
-             (begin
-               (if (null? ls_0)
-                 #f
-                 (if (not (pair? ls_0))
-                   (begin-unsafe
-                    (raise-mismatch-error
-                     'memv
-                     "not a proper list: "
-                     orig-l_0))
-                   (if (eqv? v_0 (car ls_0)) ls_0 (loop_0 (cdr ls_0))))))))))
-        (loop_0 orig-l_0))))))
-(define member
-  (let ((default_0
-         (|#%name|
-          member
-          (lambda (v_0 orig-l_0)
-            (begin
-              (letrec*
-               ((loop_0
-                 (|#%name|
-                  loop
-                  (lambda (ls_0)
-                    (begin
-                      (if (null? ls_0)
-                        #f
-                        (if (not (pair? ls_0))
-                          (begin-unsafe
-                           (raise-mismatch-error
-                            'member
-                            "not a proper list: "
-                            orig-l_0))
-                          (if (equal? v_0 (car ls_0))
-                            ls_0
-                            (loop_0 (cdr ls_0))))))))))
-               (loop_0 orig-l_0)))))))
-    (|#%name|
-     member
-     (case-lambda
-      ((v_0 orig-l_0) (begin (default_0 v_0 orig-l_0)))
-      ((v_0 orig-l_0 eq?_0)
-       (begin
-         (if (if (procedure? eq?_0) (procedure-arity-includes? eq?_0 2) #f)
-           (void)
-           (raise-argument-error
-            'member
-            "(procedure-arity-includes/c 2)"
-            eq?_0))
-         ((|#%name|
-           member
-           (lambda (v_1 orig-l_1)
-             (begin
-               (letrec*
-                ((loop_0
-                  (|#%name|
-                   loop
-                   (lambda (ls_0)
-                     (begin
-                       (if (null? ls_0)
-                         #f
-                         (if (not (pair? ls_0))
-                           (begin-unsafe
-                            (raise-mismatch-error
-                             'member
-                             "not a proper list: "
-                             orig-l_1))
-                           (if (|#%app| eq?_0 v_1 (car ls_0))
-                             ls_0
-                             (loop_0 (cdr ls_0))))))))))
-                (loop_0 orig-l_1)))))
-          v_0
-          orig-l_0)))))))
 (define call-with-exception-handler
   (lambda (exnh_0 thunk_0)
     (begin0
@@ -1957,7 +1850,7 @@
 (define reannotate/new-srcloc
   (lambda (old-term_0 new-term_0 new-srcloc_0)
     (datum->syntax #f new-term_0 new-srcloc_0 old-term_0)))
-(define finish56
+(define finish48
   (make-struct-type-install-properties
    '(known-constant)
    0
@@ -1978,7 +1871,7 @@
    #f
    0
    0))
-(define effect_2537 (finish56 struct:known-constant))
+(define effect_2537 (finish48 struct:known-constant))
 (define known-constant
   (|#%name|
    known-constant
@@ -1996,7 +1889,7 @@
         (if (impersonator? v)
           (known-constant?_2598 (impersonator-val v))
           #f))))))
-(define finish59
+(define finish51
   (make-struct-type-install-properties
    '(known-consistent)
    0
@@ -2029,7 +1922,7 @@
    #f
    0
    0))
-(define effect_2382 (finish59 struct:known-consistent))
+(define effect_2382 (finish51 struct:known-consistent))
 (define known-consistent
   (|#%name|
    known-consistent
@@ -2047,7 +1940,7 @@
         (if (impersonator? v)
           (known-consistent?_3048 (impersonator-val v))
           #f))))))
-(define finish62
+(define finish54
   (make-struct-type-install-properties
    '(known-authentic)
    0
@@ -2080,7 +1973,7 @@
    #f
    0
    0))
-(define effect_2570 (finish62 struct:known-authentic))
+(define effect_2570 (finish54 struct:known-authentic))
 (define known-authentic
   (|#%name|
    known-authentic
@@ -2098,7 +1991,7 @@
         (if (impersonator? v)
           (known-authentic?_3119 (impersonator-val v))
           #f))))))
-(define finish65
+(define finish57
   (make-struct-type-install-properties
    '(known-copy)
    1
@@ -2131,7 +2024,7 @@
    #f
    1
    1))
-(define effect_2542 (finish65 struct:known-copy))
+(define effect_2542 (finish57 struct:known-copy))
 (define known-copy
   (|#%name|
    known-copy
@@ -2163,7 +2056,7 @@
          s
          'known-copy
          'id))))))
-(define finish69
+(define finish61
   (make-struct-type-install-properties
    '(known-literal)
    1
@@ -2196,7 +2089,7 @@
    #f
    1
    1))
-(define effect_2788 (finish69 struct:known-literal))
+(define effect_2788 (finish61 struct:known-literal))
 (define known-literal
   (|#%name|
    known-literal
@@ -2230,7 +2123,7 @@
          s
          'known-literal
          'value))))))
-(define finish73
+(define finish65
   (make-struct-type-install-properties
    '(known-procedure)
    1
@@ -2263,7 +2156,7 @@
    #f
    1
    1))
-(define effect_2677 (finish73 struct:known-procedure))
+(define effect_2677 (finish65 struct:known-procedure))
 (define known-procedure
   (|#%name|
    known-procedure
@@ -2299,7 +2192,7 @@
          s
          'known-procedure
          'arity-mask))))))
-(define finish77
+(define finish69
   (make-struct-type-install-properties
    '(known-procedure/single-valued)
    0
@@ -2332,7 +2225,7 @@
    #f
    0
    0))
-(define effect_2532 (finish77 struct:known-procedure/single-valued))
+(define effect_2532 (finish69 struct:known-procedure/single-valued))
 (define known-procedure/single-valued
   (|#%name|
    known-procedure/single-valued
@@ -2355,7 +2248,7 @@
         (if (impersonator? v)
           (known-procedure/single-valued?_3105 (impersonator-val v))
           #f))))))
-(define finish80
+(define finish72
   (make-struct-type-install-properties
    '(known-procedure/no-prompt)
    0
@@ -2388,7 +2281,7 @@
    #f
    0
    0))
-(define effect_1771 (finish80 struct:known-procedure/no-prompt))
+(define effect_1771 (finish72 struct:known-procedure/no-prompt))
 (define known-procedure/no-prompt
   (|#%name|
    known-procedure/no-prompt
@@ -2411,7 +2304,7 @@
         (if (impersonator? v)
           (known-procedure/no-prompt?_2036 (impersonator-val v))
           #f))))))
-(define finish83
+(define finish75
   (make-struct-type-install-properties
    '(known-procedure/no-prompt/multi)
    0
@@ -2444,7 +2337,7 @@
    #f
    0
    0))
-(define effect_2793 (finish83 struct:known-procedure/no-prompt/multi))
+(define effect_2793 (finish75 struct:known-procedure/no-prompt/multi))
 (define known-procedure/no-prompt/multi
   (|#%name|
    known-procedure/no-prompt/multi
@@ -2467,7 +2360,7 @@
         (if (impersonator? v)
           (known-procedure/no-prompt/multi?_2394 (impersonator-val v))
           #f))))))
-(define finish86
+(define finish78
   (make-struct-type-install-properties
    '(known-procedure/no-return)
    0
@@ -2500,7 +2393,7 @@
    #f
    0
    0))
-(define effect_2517 (finish86 struct:known-procedure/no-return))
+(define effect_2517 (finish78 struct:known-procedure/no-return))
 (define known-procedure/no-return
   (|#%name|
    known-procedure/no-return
@@ -2523,7 +2416,7 @@
         (if (impersonator? v)
           (known-procedure/no-return?_1763 (impersonator-val v))
           #f))))))
-(define finish89
+(define finish81
   (make-struct-type-install-properties
    '(known-procedure/can-inline)
    1
@@ -2556,7 +2449,7 @@
    #f
    1
    1))
-(define effect_2308 (finish89 struct:known-procedure/can-inline))
+(define effect_2308 (finish81 struct:known-procedure/can-inline))
 (define known-procedure/can-inline
   (|#%name|
    known-procedure/can-inline
@@ -2597,7 +2490,7 @@
          s
          'known-procedure/can-inline
          'expr))))))
-(define finish93
+(define finish85
   (make-struct-type-install-properties
    '(known-procedure/can-inline/need-imports)
    1
@@ -2630,7 +2523,7 @@
    #f
    1
    1))
-(define effect_2618 (finish93 struct:known-procedure/can-inline/need-imports))
+(define effect_2618 (finish85 struct:known-procedure/can-inline/need-imports))
 (define known-procedure/can-inline/need-imports
   (|#%name|
    known-procedure/can-inline/need-imports
@@ -2671,7 +2564,7 @@
          s
          'known-procedure/can-inline/need-imports
          'needed))))))
-(define finish97
+(define finish89
   (make-struct-type-install-properties
    '(known-procedure/folding)
    0
@@ -2704,7 +2597,7 @@
    #f
    0
    0))
-(define effect_2478 (finish97 struct:known-procedure/folding))
+(define effect_2478 (finish89 struct:known-procedure/folding))
 (define known-procedure/folding
   (|#%name|
    known-procedure/folding
@@ -2727,7 +2620,7 @@
         (if (impersonator? v)
           (known-procedure/folding?_2882 (impersonator-val v))
           #f))))))
-(define finish100
+(define finish92
   (make-struct-type-install-properties
    '(known-procedure/folding/limited)
    1
@@ -2760,7 +2653,7 @@
    #f
    1
    1))
-(define effect_2518 (finish100 struct:known-procedure/folding/limited))
+(define effect_2518 (finish92 struct:known-procedure/folding/limited))
 (define known-procedure/folding/limited
   (|#%name|
    known-procedure/folding/limited
@@ -2801,7 +2694,7 @@
          s
          'known-procedure/folding/limited
          'kind))))))
-(define finish104
+(define finish96
   (make-struct-type-install-properties
    '(known-procedure/succeeds)
    0
@@ -2834,7 +2727,7 @@
    #f
    0
    0))
-(define effect_2467 (finish104 struct:known-procedure/succeeds))
+(define effect_2467 (finish96 struct:known-procedure/succeeds))
 (define known-procedure/succeeds
   (|#%name|
    known-procedure/succeeds
@@ -2857,7 +2750,7 @@
         (if (impersonator? v)
           (known-procedure/succeeds?_3041 (impersonator-val v))
           #f))))))
-(define finish107
+(define finish99
   (make-struct-type-install-properties
    '(known-procedure/allocates)
    0
@@ -2890,7 +2783,7 @@
    #f
    0
    0))
-(define effect_2336 (finish107 struct:known-procedure/allocates))
+(define effect_2336 (finish99 struct:known-procedure/allocates))
 (define known-procedure/allocates
   (|#%name|
    known-procedure/allocates
@@ -2913,7 +2806,7 @@
         (if (impersonator? v)
           (known-procedure/allocates?_2244 (impersonator-val v))
           #f))))))
-(define finish110
+(define finish102
   (make-struct-type-install-properties
    '(known-procedure/pure)
    0
@@ -2946,7 +2839,7 @@
    #f
    0
    0))
-(define effect_3058 (finish110 struct:known-procedure/pure))
+(define effect_3058 (finish102 struct:known-procedure/pure))
 (define known-procedure/pure
   (|#%name|
    known-procedure/pure
@@ -2966,7 +2859,7 @@
         (if (impersonator? v)
           (known-procedure/pure?_2240 (impersonator-val v))
           #f))))))
-(define finish113
+(define finish105
   (make-struct-type-install-properties
    '(known-procedure/pure/folding)
    0
@@ -2999,7 +2892,7 @@
    #f
    0
    0))
-(define effect_2264 (finish113 struct:known-procedure/pure/folding))
+(define effect_2264 (finish105 struct:known-procedure/pure/folding))
 (define known-procedure/pure/folding
   (|#%name|
    known-procedure/pure/folding
@@ -3022,7 +2915,7 @@
         (if (impersonator? v)
           (known-procedure/pure/folding?_2719 (impersonator-val v))
           #f))))))
-(define finish116
+(define finish108
   (make-struct-type-install-properties
    '(known-procedure/pure/folding-unsafe)
    1
@@ -3055,7 +2948,7 @@
    #f
    1
    1))
-(define effect_2657 (finish116 struct:known-procedure/pure/folding-unsafe))
+(define effect_2657 (finish108 struct:known-procedure/pure/folding-unsafe))
 (define known-procedure/pure/folding-unsafe
   (|#%name|
    known-procedure/pure/folding-unsafe
@@ -3096,7 +2989,7 @@
          s
          'known-procedure/pure/folding-unsafe
          'safe))))))
-(define finish120
+(define finish112
   (make-struct-type-install-properties
    '(known-procedure/has-unsafe)
    1
@@ -3129,7 +3022,7 @@
    #f
    1
    1))
-(define effect_1752 (finish120 struct:known-procedure/has-unsafe))
+(define effect_1752 (finish112 struct:known-procedure/has-unsafe))
 (define known-procedure/has-unsafe
   (|#%name|
    known-procedure/has-unsafe
@@ -3170,7 +3063,7 @@
          s
          'known-procedure/has-unsafe
          'alternate))))))
-(define finish124
+(define finish116
   (make-struct-type-install-properties
    '(known-procedure/has-unsafe/folding)
    0
@@ -3203,7 +3096,7 @@
    #f
    0
    0))
-(define effect_2489 (finish124 struct:known-procedure/has-unsafe/folding))
+(define effect_2489 (finish116 struct:known-procedure/has-unsafe/folding))
 (define known-procedure/has-unsafe/folding
   (|#%name|
    known-procedure/has-unsafe/folding
@@ -3226,7 +3119,7 @@
         (if (impersonator? v)
           (known-procedure/has-unsafe/folding?_2169 (impersonator-val v))
           #f))))))
-(define finish127
+(define finish119
   (make-struct-type-install-properties
    '(known-procedure/has-unsafe/folding/limited)
    1
@@ -3260,7 +3153,7 @@
    1
    1))
 (define effect_2512
-  (finish127 struct:known-procedure/has-unsafe/folding/limited))
+  (finish119 struct:known-procedure/has-unsafe/folding/limited))
 (define known-procedure/has-unsafe/folding/limited
   (|#%name|
    known-procedure/has-unsafe/folding/limited
@@ -3302,7 +3195,7 @@
          s
          'known-procedure/has-unsafe/folding/limited
          'kind))))))
-(define finish131
+(define finish123
   (make-struct-type-install-properties
    '(known-struct-type)
    4
@@ -3335,7 +3228,7 @@
    #f
    4
    15))
-(define effect_2667 (finish131 struct:known-struct-type))
+(define effect_2667 (finish123 struct:known-struct-type))
 (define known-struct-type
   (|#%name|
    known-struct-type
@@ -3425,7 +3318,7 @@
          s
          'known-struct-type
          'sealed?))))))
-(define finish138
+(define finish130
   (make-struct-type-install-properties
    '(known-constructor)
    1
@@ -3458,7 +3351,7 @@
    #f
    1
    1))
-(define effect_1913 (finish138 struct:known-constructor))
+(define effect_1913 (finish130 struct:known-constructor))
 (define known-constructor
   (|#%name|
    known-constructor
@@ -3494,7 +3387,7 @@
          s
          'known-constructor
          'type))))))
-(define finish142
+(define finish134
   (make-struct-type-install-properties
    '(known-predicate)
    1
@@ -3527,7 +3420,7 @@
    #f
    1
    1))
-(define effect_2144 (finish142 struct:known-predicate))
+(define effect_2144 (finish134 struct:known-predicate))
 (define known-predicate
   (|#%name|
    known-predicate
@@ -3561,7 +3454,7 @@
          s
          'known-predicate
          'type))))))
-(define finish146
+(define finish138
   (make-struct-type-install-properties
    '(known-accessor)
    1
@@ -3594,7 +3487,7 @@
    #f
    1
    1))
-(define effect_2905 (finish146 struct:known-accessor))
+(define effect_2905 (finish138 struct:known-accessor))
 (define known-accessor
   (|#%name|
    known-accessor
@@ -3628,7 +3521,7 @@
          s
          'known-accessor
          'type))))))
-(define finish150
+(define finish142
   (make-struct-type-install-properties
    '(known-mutator)
    1
@@ -3661,7 +3554,7 @@
    #f
    1
    1))
-(define effect_2521 (finish150 struct:known-mutator))
+(define effect_2521 (finish142 struct:known-mutator))
 (define known-mutator
   (|#%name|
    known-mutator
@@ -3695,7 +3588,7 @@
          s
          'known-mutator
          'type))))))
-(define finish154
+(define finish146
   (make-struct-type-install-properties
    '(known-struct-constructor)
    1
@@ -3728,7 +3621,7 @@
    #f
    1
    1))
-(define effect_3238 (finish154 struct:known-struct-constructor))
+(define effect_3238 (finish146 struct:known-struct-constructor))
 (define known-struct-constructor
   (|#%name|
    known-struct-constructor
@@ -3769,7 +3662,7 @@
          s
          'known-struct-constructor
          'type-id))))))
-(define finish158
+(define finish150
   (make-struct-type-install-properties
    '(known-struct-predicate)
    3
@@ -3802,7 +3695,7 @@
    #f
    3
    7))
-(define effect_2384 (finish158 struct:known-struct-predicate))
+(define effect_2384 (finish150 struct:known-struct-predicate))
 (define known-struct-predicate
   (|#%name|
    known-struct-predicate
@@ -3876,7 +3769,7 @@
          s
          'known-struct-predicate
          'sealed?))))))
-(define finish164
+(define finish156
   (make-struct-type-install-properties
    '(known-field-accessor)
    4
@@ -3909,7 +3802,7 @@
    #f
    4
    15))
-(define effect_2259 (finish164 struct:known-field-accessor))
+(define effect_2259 (finish156 struct:known-field-accessor))
 (define known-field-accessor
   (|#%name|
    known-field-accessor
@@ -4001,7 +3894,7 @@
          s
          'known-field-accessor
          'known-immutable?))))))
-(define finish171
+(define finish163
   (make-struct-type-install-properties
    '(known-field-mutator)
    3
@@ -4034,7 +3927,7 @@
    #f
    3
    7))
-(define effect_2603 (finish171 struct:known-field-mutator))
+(define effect_2603 (finish163 struct:known-field-mutator))
 (define known-field-mutator
   (|#%name|
    known-field-mutator
@@ -4108,7 +4001,7 @@
          s
          'known-field-mutator
          'pos))))))
-(define finish177
+(define finish169
   (make-struct-type-install-properties
    '(known-struct-constructor/need-imports)
    1
@@ -4141,7 +4034,7 @@
    #f
    1
    1))
-(define effect_2146 (finish177 struct:known-struct-constructor/need-imports))
+(define effect_2146 (finish169 struct:known-struct-constructor/need-imports))
 (define known-struct-constructor/need-imports
   (|#%name|
    known-struct-constructor/need-imports
@@ -4182,7 +4075,7 @@
          s
          'known-struct-constructor/need-imports
          'needed))))))
-(define finish181
+(define finish173
   (make-struct-type-install-properties
    '(known-struct-predicate/need-imports)
    1
@@ -4215,7 +4108,7 @@
    #f
    1
    1))
-(define effect_3156 (finish181 struct:known-struct-predicate/need-imports))
+(define effect_3156 (finish173 struct:known-struct-predicate/need-imports))
 (define known-struct-predicate/need-imports
   (|#%name|
    known-struct-predicate/need-imports
@@ -4256,7 +4149,7 @@
          s
          'known-struct-predicate/need-imports
          'needed))))))
-(define finish185
+(define finish177
   (make-struct-type-install-properties
    '(known-field-accessor/need-imports)
    1
@@ -4289,7 +4182,7 @@
    #f
    1
    1))
-(define effect_2513 (finish185 struct:known-field-accessor/need-imports))
+(define effect_2513 (finish177 struct:known-field-accessor/need-imports))
 (define known-field-accessor/need-imports
   (|#%name|
    known-field-accessor/need-imports
@@ -4330,7 +4223,7 @@
          s
          'known-field-accessor/need-imports
          'needed))))))
-(define finish189
+(define finish181
   (make-struct-type-install-properties
    '(known-field-mutator/need-imports)
    1
@@ -4363,7 +4256,7 @@
    #f
    1
    1))
-(define effect_2273 (finish189 struct:known-field-mutator/need-imports))
+(define effect_2273 (finish181 struct:known-field-mutator/need-imports))
 (define known-field-mutator/need-imports
   (|#%name|
    known-field-mutator/need-imports
@@ -4404,7 +4297,7 @@
          s
          'known-field-mutator/need-imports
          'needed))))))
-(define finish193
+(define finish185
   (make-struct-type-install-properties
    '(known-struct-type-property/immediate-guard)
    0
@@ -4432,7 +4325,7 @@
    0
    0))
 (define effect_2294
-  (finish193 struct:known-struct-type-property/immediate-guard))
+  (finish185 struct:known-struct-type-property/immediate-guard))
 (define known-struct-type-property/immediate-guard
   (|#%name|
    known-struct-type-property/immediate-guard
@@ -4473,7 +4366,7 @@
          (let ((app_0
                 (if (string? prefix_0) prefix_0 (symbol->string prefix_0))))
            (string-append app_0 (number->string (unbox b_0)))))))))
-(define finish197
+(define finish189
   (make-struct-type-install-properties
    '(import)
    4
@@ -4494,7 +4387,7 @@
    #f
    4
    0))
-(define effect_2192 (finish197 struct:import))
+(define effect_2192 (finish189 struct:import))
 (define import1.1
   (|#%name|
    import
@@ -4560,7 +4453,7 @@
          s
          'import
          'ext-id))))))
-(define finish204
+(define finish196
   (make-struct-type-install-properties
    '(import-group)
    6
@@ -4581,7 +4474,7 @@
    #f
    6
    60))
-(define effect_2739 (finish204 struct:import-group))
+(define effect_2739 (finish196 struct:import-group))
 (define import-group2.1
   (|#%name|
    import-group
@@ -4930,7 +4823,7 @@
             (|#%app| inc-index!_0)
             (|#%app| add-group!_0 grp_0)
             grp_0))))))
-(define finish218
+(define finish210
   (make-struct-type-install-properties
    '(export)
    2
@@ -4951,7 +4844,7 @@
    #f
    2
    0))
-(define effect_2782 (finish218 struct:export))
+(define effect_2782 (finish210 struct:export))
 (define export1.1
   (|#%name|
    export
@@ -4991,7 +4884,7 @@
          s
          'export
          'ext-id))))))
-(define finish223
+(define finish215
   (make-struct-type-install-properties
    '(too-early)
    2
@@ -5012,7 +4905,7 @@
    #f
    2
    0))
-(define effect_2833 (finish223 struct:too-early))
+(define effect_2833 (finish215 struct:too-early))
 (define too-early1.1
   (|#%name|
    too-early
@@ -7300,7 +7193,7 @@
      (case-lambda
       ((k_0 im_0) k_0)
       (args (raise-binding-result-arity-error 2 args))))))
-(define finish311
+(define finish303
   (make-struct-type-install-properties
    '(struct-type-info)
    11
@@ -7321,7 +7214,7 @@
    #f
    11
    0))
-(define effect_2037 (finish311 struct:struct-type-info))
+(define effect_2037 (finish303 struct:struct-type-info))
 (define struct-type-info1.1
   (|#%name|
    struct-type-info
@@ -30749,7 +30642,7 @@
                            (schemify-body_0 (cdr l_0) wcm-state_2))))))))))
              (schemify_0 v_1 wcm-state_1)))))))
      (schemify/knowns_0 knowns_0 8 wcm-state_0 v_0))))
-(define finish1676
+(define finish1668
   (make-struct-type-install-properties
    '(convert-mode)
    4
@@ -30770,7 +30663,7 @@
    #f
    4
    0))
-(define effect_2443 (finish1676 struct:convert-mode))
+(define effect_2443 (finish1668 struct:convert-mode))
 (define convert-mode1.1
   (|#%name|
    convert-mode
@@ -39893,7 +39786,7 @@
                         (if (|#%app| need-exposed?_0 q_0)
                           #t
                           (if (extflonum? q_0) #t #f))))))))))))))
-(define finish2146
+(define finish2138
   (make-struct-type-install-properties
    '(to-unfasl)
    3
@@ -39914,7 +39807,7 @@
    #f
    3
    0))
-(define effect_2898 (finish2146 struct:to-unfasl))
+(define effect_2898 (finish2138 struct:to-unfasl))
 (define to-unfasl1.1
   (|#%name|
    to-unfasl
@@ -40044,7 +39937,7 @@
      'write
      "cannot marshal value that is embedded in compiled code\n  value: ~v"
      v_0)))
-(define finish2154
+(define finish2146
   (make-struct-type-install-properties
    '(node)
    5
@@ -40065,7 +39958,7 @@
    #f
    5
    0))
-(define effect_2547 (finish2154 struct:node))
+(define effect_2547 (finish2146 struct:node))
 (define node1.1
   (|#%name|
    node
@@ -40366,7 +40259,7 @@
                          app_2
                          (stack-set stack_1 pos_1 (car vals_1))))))))))))
          (loop_0 pos_0 vals_0 count_0 stack_0))))))
-(define finish2200
+(define finish2192
   (make-struct-type-install-properties
    '(stack-info)
    5
@@ -40387,7 +40280,7 @@
    #f
    5
    28))
-(define effect_2334 (finish2200 struct:stack-info))
+(define effect_2334 (finish2192 struct:stack-info))
 (define stack-info4.1
   (|#%name|
    stack-info
@@ -40724,7 +40617,7 @@
 (define stack-info-non-tail!
   (lambda (stk-i_0 stack-depth_0)
     (set-stack-info-non-tail-call-later?! stk-i_0 #t)))
-(define finish2214
+(define finish2206
   (make-struct-type-install-properties
    '(indirect)
    2
@@ -40745,7 +40638,7 @@
    #f
    2
    0))
-(define effect_2125 (finish2214 struct:indirect))
+(define effect_2125 (finish2206 struct:indirect))
 (define indirect1.1
   (|#%name|
    indirect
@@ -40792,7 +40685,7 @@
          s
          'indirect
          'element))))))
-(define finish2219
+(define finish2211
   (make-struct-type-install-properties
    '(boxed)
    1
@@ -40813,7 +40706,7 @@
    #f
    1
    0))
-(define effect_2970 (finish2219 struct:boxed))
+(define effect_2970 (finish2211 struct:boxed))
 (define boxed2.1
   (|#%name|
    boxed
@@ -40837,7 +40730,7 @@
        (boxed-pos_2515 s)
        ($value
         (impersonate-ref boxed-pos_2515 struct:boxed 0 s 'boxed 'pos))))))
-(define finish2223
+(define finish2215
   (make-struct-type-install-properties
    '(boxed/check)
    0
@@ -40858,7 +40751,7 @@
    #f
    0
    0))
-(define effect_2937 (finish2223 struct:boxed/check))
+(define effect_2937 (finish2215 struct:boxed/check))
 (define boxed/check3.1
   (|#%name|
    boxed/check
diff --git a/racket/src/cs/schemified/thread.scm b/racket/src/cs/schemified/thread.scm
index 0cfb010f5d..e083891bf1 100644
--- a/racket/src/cs/schemified/thread.scm
+++ b/racket/src/cs/schemified/thread.scm
@@ -162,113 +162,6 @@
 (define hash2610 (hasheq))
 (define hash2589 (hasheqv))
 (define hash2725 (hash))
-(define bad-list$1
-  (|#%name|
-   bad-list
-   (lambda (who_0 orig-l_0)
-     (begin (raise-mismatch-error who_0 "not a proper list: " orig-l_0)))))
-(define memq
-  (|#%name|
-   memq
-   (lambda (v_0 orig-l_0)
-     (begin
-       (letrec*
-        ((loop_0
-          (|#%name|
-           loop
-           (lambda (ls_0)
-             (begin
-               (if (null? ls_0)
-                 #f
-                 (if (not (pair? ls_0))
-                   (begin-unsafe
-                    (raise-mismatch-error
-                     'memq
-                     "not a proper list: "
-                     orig-l_0))
-                   (if (eq? v_0 (car ls_0)) ls_0 (loop_0 (cdr ls_0))))))))))
-        (loop_0 orig-l_0))))))
-(define memv
-  (|#%name|
-   memv
-   (lambda (v_0 orig-l_0)
-     (begin
-       (letrec*
-        ((loop_0
-          (|#%name|
-           loop
-           (lambda (ls_0)
-             (begin
-               (if (null? ls_0)
-                 #f
-                 (if (not (pair? ls_0))
-                   (begin-unsafe
-                    (raise-mismatch-error
-                     'memv
-                     "not a proper list: "
-                     orig-l_0))
-                   (if (eqv? v_0 (car ls_0)) ls_0 (loop_0 (cdr ls_0))))))))))
-        (loop_0 orig-l_0))))))
-(define member
-  (let ((default_0
-         (|#%name|
-          member
-          (lambda (v_0 orig-l_0)
-            (begin
-              (letrec*
-               ((loop_0
-                 (|#%name|
-                  loop
-                  (lambda (ls_0)
-                    (begin
-                      (if (null? ls_0)
-                        #f
-                        (if (not (pair? ls_0))
-                          (begin-unsafe
-                           (raise-mismatch-error
-                            'member
-                            "not a proper list: "
-                            orig-l_0))
-                          (if (equal? v_0 (car ls_0))
-                            ls_0
-                            (loop_0 (cdr ls_0))))))))))
-               (loop_0 orig-l_0)))))))
-    (|#%name|
-     member
-     (case-lambda
-      ((v_0 orig-l_0) (begin (default_0 v_0 orig-l_0)))
-      ((v_0 orig-l_0 eq?_0)
-       (begin
-         (if (if (procedure? eq?_0) (procedure-arity-includes? eq?_0 2) #f)
-           (void)
-           (raise-argument-error
-            'member
-            "(procedure-arity-includes/c 2)"
-            eq?_0))
-         ((|#%name|
-           member
-           (lambda (v_1 orig-l_1)
-             (begin
-               (letrec*
-                ((loop_0
-                  (|#%name|
-                   loop
-                   (lambda (ls_0)
-                     (begin
-                       (if (null? ls_0)
-                         #f
-                         (if (not (pair? ls_0))
-                           (begin-unsafe
-                            (raise-mismatch-error
-                             'member
-                             "not a proper list: "
-                             orig-l_1))
-                           (if (|#%app| eq?_0 v_1 (car ls_0))
-                             ls_0
-                             (loop_0 (cdr ls_0))))))))))
-                (loop_0 orig-l_1)))))
-          v_0
-          orig-l_0)))))))
 (define select-handler/no-breaks
   (lambda (e_0 bpz_0 l_0)
     (with-continuation-mark*
@@ -972,7 +865,7 @@
         (void)
         (raise-argument-error 'hash-empty? "hash?" table_0))
       (zero? (hash-count table_0)))))
-(define finish35
+(define finish27
   (make-struct-type-install-properties
    '(queue)
    2
@@ -993,7 +886,7 @@
    #f
    2
    3))
-(define effect_2998 (finish35 struct:queue))
+(define effect_2998 (finish27 struct:queue))
 (define queue1.1
   (|#%name|
    queue
@@ -1006,7 +899,7 @@
   (|#%name| set-queue-start! (record-mutator struct:queue 0)))
 (define set-queue-end!
   (|#%name| set-queue-end! (record-mutator struct:queue 1)))
-(define finish37
+(define finish29
   (make-struct-type-install-properties
    '(node)
    3
@@ -1027,7 +920,7 @@
    #f
    3
    6))
-(define effect_1943 (finish37 struct:node$2))
+(define effect_1943 (finish29 struct:node$2))
 (define node2.1
   (|#%name|
    node
@@ -1240,7 +1133,7 @@
   (hash-ref (primitive-table '|#%engine|) 'continuation-current-primitive #f))
 (define host:prop:unsafe-authentic-override
   (hash-ref (primitive-table '|#%engine|) 'prop:unsafe-authentic-override #f))
-(define finish45
+(define finish37
   (make-struct-type-install-properties
    '(node)
    5
@@ -1261,7 +1154,7 @@
    #f
    5
    0))
-(define effect_1944 (finish45 struct:node$1))
+(define effect_1944 (finish37 struct:node$1))
 (define node1.1$1
   (|#%name|
    node
@@ -1513,7 +1406,7 @@
     (if (not (node-right t_0))
       (let ((app_0 (node-key t_0))) (values app_0 (node-val t_0)))
       (max-key+value (node-right t_0)))))
-(define finish75
+(define finish67
   (make-struct-type-install-properties
    '(sandman)
    11
@@ -1540,7 +1433,7 @@
    #f
    11
    2047))
-(define effect_2951 (finish75 struct:sandman))
+(define effect_2951 (finish67 struct:sandman))
 (define sandman1.1
   (|#%name|
    sandman
@@ -1978,7 +1871,7 @@
              'guard-for-prop:evt
              "(or/c evt? (procedure-arity-includes/c 1) exact-nonnegative-integer?)"
              v_0))))))))
-(define finish93
+(define finish85
   (make-struct-type-install-properties
    '(selector-prop-evt-value)
    1
@@ -1999,7 +1892,7 @@
    #f
    1
    0))
-(define effect_2735 (finish93 struct:selector-prop-evt-value))
+(define effect_2735 (finish85 struct:selector-prop-evt-value))
 (define selector-prop-evt-value1.1
   (|#%name|
    selector-prop-evt-value
@@ -2026,7 +1919,7 @@
      (begin
        (let ((or-part_0 (primary-evt? v_0)))
          (if or-part_0 or-part_0 (secondary-evt? v_0)))))))
-(define finish95
+(define finish87
   (make-struct-type-install-properties
    '(poller)
    1
@@ -2047,7 +1940,7 @@
    #f
    1
    0))
-(define effect_2545 (finish95 struct:poller))
+(define effect_2545 (finish87 struct:poller))
 (define poller2.1
   (|#%name|
    poller
@@ -2055,7 +1948,7 @@
     (make-record-constructor-descriptor struct:poller #f #f))))
 (define poller? (|#%name| poller? (record-predicate struct:poller)))
 (define poller-proc (|#%name| poller-proc (record-accessor struct:poller 0)))
-(define finish97
+(define finish89
   (make-struct-type-install-properties
    '(poll-ctx)
    4
@@ -2076,7 +1969,7 @@
    #f
    4
    8))
-(define effect_2667 (finish97 struct:poll-ctx))
+(define effect_2667 (finish89 struct:poll-ctx))
 (define poll-ctx3.1
   (|#%name|
    poll-ctx
@@ -2093,7 +1986,7 @@
   (|#%name| poll-ctx-incomplete? (record-accessor struct:poll-ctx 3)))
 (define set-poll-ctx-incomplete?!
   (|#%name| set-poll-ctx-incomplete?! (record-mutator struct:poll-ctx 3)))
-(define finish100
+(define finish92
   (make-struct-type-install-properties
    '(never-evt)
    0
@@ -2117,7 +2010,7 @@
    #f
    0
    0))
-(define effect_2474 (finish100 struct:never-evt))
+(define effect_2474 (finish92 struct:never-evt))
 (define never-evt4.1
   (|#%name|
    never-evt
@@ -2134,7 +2027,7 @@
        ($value
         (if (impersonator? v) (never-evt?_1958 (impersonator-val v)) #f))))))
 (define the-never-evt (never-evt4.1))
-(define finish103
+(define finish95
   (make-struct-type-install-properties
    '(always-evt)
    0
@@ -2158,7 +2051,7 @@
    #f
    0
    0))
-(define effect_2333 (finish103 struct:always-evt))
+(define effect_2333 (finish95 struct:always-evt))
 (define always-evt5.1
   (|#%name|
    always-evt
@@ -2175,7 +2068,7 @@
        ($value
         (if (impersonator? v) (always-evt?_2466 (impersonator-val v)) #f))))))
 (define the-always-evt (always-evt5.1))
-(define finish106
+(define finish98
   (make-struct-type-install-properties
    '(async-evt)
    0
@@ -2199,7 +2092,7 @@
    #f
    0
    0))
-(define effect_2210 (finish106 struct:async-evt))
+(define effect_2210 (finish98 struct:async-evt))
 (define async-evt6.1
   (|#%name|
    async-evt
@@ -2216,7 +2109,7 @@
        ($value
         (if (impersonator? v) (async-evt?_2619 (impersonator-val v)) #f))))))
 (define the-async-evt (async-evt6.1))
-(define finish109
+(define finish101
   (make-struct-type-install-properties
    '(evt)
    2
@@ -2233,7 +2126,7 @@
    'wrap-evt))
 (define struct:wrap-evt
   (make-record-type-descriptor* 'evt #f (|#%nongenerative-uid| evt) #f #f 2 0))
-(define effect_2815 (finish109 struct:wrap-evt))
+(define effect_2815 (finish101 struct:wrap-evt))
 (define wrap-evt7.1
   (|#%name|
    wrap-evt
@@ -2274,7 +2167,7 @@
          s
          'evt
          'wrap))))))
-(define finish114
+(define finish106
   (make-struct-type-install-properties
    '(handle-evt)
    0
@@ -2295,7 +2188,7 @@
    #f
    0
    0))
-(define effect_3118 (finish114 struct:handle-evt))
+(define effect_3118 (finish106 struct:handle-evt))
 (define handle-evt8.1
   (|#%name|
    handle-evt
@@ -2313,7 +2206,7 @@
         (if (impersonator? v)
           (handle-evt?$1_2894 (impersonator-val v))
           #f))))))
-(define finish117
+(define finish109
   (make-struct-type-install-properties
    '(control-state-evt)
    5
@@ -2337,7 +2230,7 @@
    #f
    5
    0))
-(define effect_3002 (finish117 struct:control-state-evt))
+(define effect_3002 (finish109 struct:control-state-evt))
 (define control-state-evt9.1
   (|#%name|
    control-state-evt
@@ -2445,7 +2338,7 @@
          s
          'control-state-evt
          'retry-proc))))))
-(define finish125
+(define finish117
   (make-struct-type-install-properties
    '(evt)
    1
@@ -2462,7 +2355,7 @@
    'poll-guard-evt))
 (define struct:poll-guard-evt
   (make-record-type-descriptor* 'evt #f (|#%nongenerative-uid| evt) #f #f 1 0))
-(define effect_2169 (finish125 struct:poll-guard-evt))
+(define effect_2169 (finish117 struct:poll-guard-evt))
 (define poll-guard-evt10.1
   (|#%name|
    poll-guard-evt
@@ -2496,7 +2389,7 @@
          s
          'evt
          'proc))))))
-(define finish129
+(define finish121
   (make-struct-type-install-properties
    '(evt)
    1
@@ -2513,7 +2406,7 @@
    'choice-evt))
 (define struct:choice-evt
   (make-record-type-descriptor* 'evt #f (|#%nongenerative-uid| evt) #f #f 1 0))
-(define effect_2613 (finish129 struct:choice-evt))
+(define effect_2613 (finish121 struct:choice-evt))
 (define choice-evt11.1
   (|#%name|
    choice-evt
@@ -2575,7 +2468,7 @@
           (if (poller? v_1)
             (|#%app| (poller-proc v_1) evt_0 poll-ctx_0)
             (if (1/evt? v_1) (values #f v_1) (values #f the-never-evt))))))))
-(define finish132
+(define finish124
   (make-struct-type-install-properties
    '(delayed-poll)
    1
@@ -2596,7 +2489,7 @@
    #f
    1
    0))
-(define effect_2263 (finish132 struct:delayed-poll))
+(define effect_2263 (finish124 struct:delayed-poll))
 (define delayed-poll12.1
   (|#%name|
    delayed-poll
@@ -2606,7 +2499,7 @@
   (|#%name| delayed-poll? (record-predicate struct:delayed-poll)))
 (define delayed-poll-resume
   (|#%name| delayed-poll-resume (record-accessor struct:delayed-poll 0)))
-(define finish135
+(define finish127
   (make-struct-type-install-properties
    '(poller-evt)
    1
@@ -2627,7 +2520,7 @@
    #f
    1
    0))
-(define effect_2260 (finish135 struct:poller-evt))
+(define effect_2260 (finish127 struct:poller-evt))
 (define poller-evt13.1
   (|#%name|
    poller-evt
@@ -2662,7 +2555,7 @@
 (define-values
  (prop:waiter waiter? waiter-ref)
  (make-struct-type-property 'waiter))
-(define finish138
+(define finish130
   (make-struct-type-install-properties
    '(waiter-methods)
    2
@@ -2683,7 +2576,7 @@
    #f
    2
    0))
-(define effect_2191 (finish138 struct:waiter-methods))
+(define effect_2191 (finish130 struct:waiter-methods))
 (define waiter-methods1.1
   (|#%name|
    waiter-methods
@@ -2706,7 +2599,7 @@
 (define waiter-suspend!
   (lambda (w_0 interrupt-cb_0)
     (|#%app| (waiter-methods-suspend (waiter-ref w_0)) w_0 interrupt-cb_0)))
-(define finish141
+(define finish133
   (make-struct-type-install-properties
    '(select-waiter)
    1
@@ -2735,7 +2628,7 @@
    #f
    1
    0))
-(define effect_2826 (finish141 struct:select-waiter))
+(define effect_2826 (finish133 struct:select-waiter))
 (define select-waiter7.1
   (|#%name|
    select-waiter
@@ -2769,7 +2662,7 @@
          s
          'select-waiter
          'proc))))))
-(define finish144
+(define finish136
   (make-struct-type-install-properties
    '(custodian)
    13
@@ -2790,7 +2683,7 @@
    #f
    13
    8188))
-(define effect_2161 (finish144 struct:custodian))
+(define effect_2161 (finish136 struct:custodian))
 (define custodian1.1
   (|#%name|
    custodian
@@ -2902,7 +2795,7 @@
 (define-values
  (prop:place-message place-message? place-message-ref)
  (make-struct-type-property 'place-message))
-(define finish147
+(define finish139
   (make-struct-type-install-properties
    '(message-ized)
    1
@@ -2923,7 +2816,7 @@
    #f
    1
    0))
-(define effect_2995 (finish147 struct:message-ized))
+(define effect_2995 (finish139 struct:message-ized))
 (define message-ized1.1
   (|#%name|
    message-ized
@@ -3997,7 +3890,7 @@
                               (|#%app| (message-ized-unmessage v_1))
                               v_1)))))))))))))
        (loop_0 v_0)))))
-(define finish157
+(define finish149
   (make-struct-type-install-properties
    '(place)
    19
@@ -4024,7 +3917,7 @@
    #f
    19
    491440))
-(define effect_2619 (finish157 struct:place))
+(define effect_2619 (finish149 struct:place))
 (define place1.1
   (|#%name|
    place
@@ -4160,7 +4053,7 @@
                    (for-loop_0 lst_0))))
               (void)))))
       (void))))
-(define finish162
+(define finish154
   (make-struct-type-install-properties
    '(semaphore)
    1
@@ -4188,7 +4081,7 @@
    #f
    1
    1))
-(define effect_2927 (finish162 struct:semaphore))
+(define effect_2927 (finish154 struct:semaphore))
 (define semaphore1.1
   (|#%name|
    semaphore
@@ -4200,7 +4093,7 @@
 (define set-semaphore-count!
   (|#%name| set-semaphore-count! (record-mutator struct:semaphore 0)))
 (define count-field-pos 2)
-(define finish165
+(define finish157
   (make-struct-type-install-properties
    '(semaphore-peek-evt)
    1
@@ -4227,7 +4120,7 @@
    #f
    1
    0))
-(define effect_2414 (finish165 struct:semaphore-peek-evt))
+(define effect_2414 (finish157 struct:semaphore-peek-evt))
 (define semaphore-peek-evt2.1
   (|#%name|
    semaphore-peek-evt
@@ -4263,7 +4156,7 @@
          s
          'semaphore-peek-evt
          'sema))))))
-(define finish169
+(define finish161
   (make-struct-type-install-properties
    '(semaphore-peek-select-waiter)
    0
@@ -4284,7 +4177,7 @@
    #f
    0
    0))
-(define effect_2387 (finish169 struct:semaphore-peek-select-waiter))
+(define effect_2387 (finish161 struct:semaphore-peek-select-waiter))
 (define semaphore-peek-select-waiter3.1
   (|#%name|
    semaphore-peek-select-waiter
@@ -4505,7 +4398,7 @@
         (set-semaphore-count! s_0 (sub1 c_0))
         (internal-error
          "semaphore-wait/atomic: cannot decrement semaphore")))))
-(define finish182
+(define finish174
   (make-struct-type-install-properties
    '(node)
    2
@@ -4526,7 +4419,7 @@
    #f
    2
    3))
-(define effect_2547 (finish182 struct:node))
+(define effect_2547 (finish174 struct:node))
 (define node1.1
   (|#%name|
    node
@@ -4541,7 +4434,7 @@
   (|#%name| set-node-next! (record-mutator struct:node 1)))
 (define child-node (lambda (child_0) child_0))
 (define node-child (lambda (n_0) n_0))
-(define finish184
+(define finish176
   (make-struct-type-install-properties
    '(thread-group)
    4
@@ -4562,7 +4455,7 @@
    #f
    4
    14))
-(define effect_2514 (finish184 struct:thread-group))
+(define effect_2514 (finish176 struct:thread-group))
 (define thread-group2.1
   (|#%name|
    thread-group
@@ -4713,7 +4606,7 @@
                     (begin-unsafe n_0)
                     accum_1)))))))))
        (loop_0 (thread-group-chain-start parent_0) accum_0)))))
-(define finish196
+(define finish188
   (make-struct-type-install-properties
    '(schedule-info)
    2
@@ -4734,7 +4627,7 @@
    #f
    2
    3))
-(define effect_2462 (finish196 struct:schedule-info))
+(define effect_2462 (finish188 struct:schedule-info))
 (define schedule-info1.1
   (|#%name|
    schedule-info
@@ -4844,7 +4737,7 @@
   (lambda (sched-info_0) (set-schedule-info-did-work?! sched-info_0 #t)))
 (define reference-sink
   (lambda (v_0) (ephemeron-value (make-ephemeron #f (void)) (void) v_0)))
-(define finish204
+(define finish196
   (make-struct-type-install-properties
    '(plumber)
    2
@@ -4865,7 +4758,7 @@
    #f
    2
    0))
-(define effect_2412 (finish204 struct:plumber))
+(define effect_2412 (finish196 struct:plumber))
 (define plumber1.1
   (|#%name|
    plumber
@@ -4892,7 +4785,7 @@
          (raise-argument-error 'current-plumber "plumber?" v_0))
        v_0))
    'current-plumber))
-(define finish208
+(define finish200
   (make-struct-type-install-properties
    '(plumber-flush-handle)
    2
@@ -4913,7 +4806,7 @@
    #f
    2
    0))
-(define effect_2328 (finish208 struct:plumber-flush-handle))
+(define effect_2328 (finish200 struct:plumber-flush-handle))
 (define plumber-flush-handle2.1
   (|#%name|
    plumber-flush-handle
@@ -5124,7 +5017,7 @@
     (|#%name|
      exit
      (case-lambda (() (begin (exit_0 #t))) ((v1_0) (exit_0 v1_0))))))
-(define finish212
+(define finish204
   (make-struct-type-install-properties
    '(custodian-box)
    2
@@ -5150,7 +5043,7 @@
    #f
    2
    1))
-(define effect_2694 (finish212 struct:custodian-box))
+(define effect_2694 (finish204 struct:custodian-box))
 (define custodian-box1.1
   (|#%name|
    custodian-box
@@ -5164,7 +5057,7 @@
   (|#%name| custodian-box-sema (record-accessor struct:custodian-box 1)))
 (define set-custodian-box-v!
   (|#%name| set-custodian-box-v! (record-mutator struct:custodian-box 0)))
-(define finish214
+(define finish206
   (make-struct-type-install-properties
    '(willed-callback)
    2
@@ -5185,7 +5078,7 @@
    #f
    2
    0))
-(define effect_2527 (finish214 struct:willed-callback))
+(define effect_2527 (finish206 struct:willed-callback))
 (define willed-callback2.1
   (|#%name|
    willed-callback
@@ -5197,7 +5090,7 @@
   (|#%name| willed-callback-proc (record-accessor struct:willed-callback 0)))
 (define willed-callback-will
   (|#%name| willed-callback-will (record-accessor struct:willed-callback 1)))
-(define finish216
+(define finish208
   (make-struct-type-install-properties
    '(at-exit-callback)
    0
@@ -5218,7 +5111,7 @@
    #f
    0
    0))
-(define effect_2512 (finish216 struct:at-exit-callback))
+(define effect_2512 (finish208 struct:at-exit-callback))
 (define at-exit-callback3.1
   (|#%name|
    at-exit-callback
@@ -5226,7 +5119,7 @@
     (make-record-constructor-descriptor struct:at-exit-callback #f #f))))
 (define at-exit-callback?
   (|#%name| at-exit-callback? (record-predicate struct:at-exit-callback)))
-(define finish218
+(define finish210
   (make-struct-type-install-properties
    '(custodian-reference)
    1
@@ -5247,7 +5140,7 @@
    #f
    1
    1))
-(define effect_2141 (finish218 struct:custodian-reference))
+(define effect_2141 (finish210 struct:custodian-reference))
 (define custodian-reference4.1
   (|#%name|
    custodian-reference
@@ -6565,7 +6458,7 @@
                   (void)))
               (void)))))))
      (loop_0 mref_0))))
-(define finish235
+(define finish227
   (make-struct-type-install-properties
    '(thread)
    24
@@ -6612,7 +6505,7 @@
    #f
    24
    16777082))
-(define effect_2668 (finish235 struct:thread))
+(define effect_2668 (finish227 struct:thread))
 (define thread1.1
   (|#%name|
    thread
@@ -7081,7 +6974,7 @@
            (void)
            (raise-argument-error 'thread-wait "thread?" t_0))
          (1/semaphore-wait (|#%app| get-thread-dead-sema t_0)))))))
-(define finish248
+(define finish240
   (make-struct-type-install-properties
    '(thread-dead-evt)
    1
@@ -7106,7 +6999,7 @@
    #f
    1
    0))
-(define effect_2691 (finish248 struct:dead-evt))
+(define effect_2691 (finish240 struct:dead-evt))
 (define dead-evt13.1
   (|#%name|
    dead-evt
@@ -7418,7 +7311,7 @@
                     (let ((app_0 (cdr crs_0)))
                       (loop_0 app_0 (cons (car crs_0) accum_0))))))))))))
      (loop_0 (thread-custodian-references t_0) null))))
-(define finish260
+(define finish252
   (make-struct-type-install-properties
    '(transitive-resume)
    2
@@ -7439,7 +7332,7 @@
    #f
    2
    0))
-(define effect_3100 (finish260 struct:transitive-resume))
+(define effect_3100 (finish252 struct:transitive-resume))
 (define transitive-resume16.1
   (|#%name|
    transitive-resume
@@ -7549,7 +7442,7 @@
           (set-thread-interrupt-callback! t_0 #f)
           (|#%app| interrupt-callback_0))
         (void)))))
-(define finish266
+(define finish258
   (make-struct-type-install-properties
    '(suspend-resume-evt)
    2
@@ -7576,7 +7469,7 @@
    #f
    2
    2))
-(define effect_2478 (finish266 struct:suspend-resume-evt))
+(define effect_2478 (finish258 struct:suspend-resume-evt))
 (define suspend-resume-evt17.1
   (|#%name|
    suspend-resume-evt
@@ -7650,7 +7543,7 @@
          v
          'suspend-resume-evt
          'thread))))))
-(define finish272
+(define finish264
   (make-struct-type-install-properties
    '(thread-suspend-evt)
    0
@@ -7671,7 +7564,7 @@
    #f
    0
    0))
-(define effect_2442 (finish272 struct:suspend-evt))
+(define effect_2442 (finish264 struct:suspend-evt))
 (define suspend-evt18.1
   (|#%name|
    suspend-evt
@@ -7687,7 +7580,7 @@
        #t
        ($value
         (if (impersonator? v) (suspend-evt?_3224 (impersonator-val v)) #f))))))
-(define finish275
+(define finish267
   (make-struct-type-install-properties
    '(thread-resume-evt)
    0
@@ -7708,7 +7601,7 @@
    #f
    0
    0))
-(define effect_2874 (finish275 struct:resume-evt))
+(define effect_2874 (finish267 struct:resume-evt))
 (define resume-evt19.1
   (|#%name|
    resume-evt
@@ -8126,7 +8019,7 @@
                 (begin-unsafe (queue-add-front! (thread-mailbox t_0) msg_0)))
               lst_0))
            (end-atomic)))))))
-(define finish290
+(define finish282
   (make-struct-type-install-properties
    '(thread-receive-evt)
    0
@@ -8187,7 +8080,7 @@
    #f
    0
    0))
-(define effect_2506 (finish290 struct:thread-receiver-evt))
+(define effect_2506 (finish282 struct:thread-receiver-evt))
 (define thread-receiver-evt26.1
   (|#%name|
    thread-receiver-evt
@@ -8234,7 +8127,7 @@
                 #f))))
        (begin-unsafe (set! thread-engine-for-roots thread-engine_0))))
     (void)))
-(define finish294
+(define finish286
   (make-struct-type-install-properties
    '(channel)
    2
@@ -8259,7 +8152,7 @@
    #f
    2
    0))
-(define effect_2481 (finish294 struct:channel))
+(define effect_2481 (finish286 struct:channel))
 (define channel1.1
   (|#%name|
    channel
@@ -8306,7 +8199,7 @@
          s
          'channel
          'put-queue))))))
-(define finish301
+(define finish293
   (make-struct-type-install-properties
    '(channel-put-evt)
    2
@@ -8337,7 +8230,7 @@
    #f
    2
    0))
-(define effect_2715 (finish301 struct:channel-put-evt*))
+(define effect_2715 (finish293 struct:channel-put-evt*))
 (define channel-put-evt*2.1
   (|#%name|
    channel-put-evt*
@@ -8387,7 +8280,7 @@
          s
          'channel-put-evt
          'v))))))
-(define finish307
+(define finish299
   (make-struct-type-install-properties
    '(channel-select-waiter)
    1
@@ -8408,7 +8301,7 @@
    #f
    1
    0))
-(define effect_2956 (finish307 struct:channel-select-waiter))
+(define effect_2956 (finish299 struct:channel-select-waiter))
 (define channel-select-waiter3.1
   (|#%name|
    channel-select-waiter
@@ -8901,7 +8794,7 @@
                    (car args_1))
                   (loop_0 (cddr args_1))))))))))
      (loop_0 args_0))))
-(define finish337
+(define finish329
   (make-struct-type-install-properties
    '(syncing)
    5
@@ -8922,7 +8815,7 @@
    #f
    5
    31))
-(define effect_2363 (finish337 struct:syncing))
+(define effect_2363 (finish329 struct:syncing))
 (define syncing1.1
   (|#%name|
    syncing
@@ -9107,7 +9000,7 @@
          v
          'syncing
          'need-retry?))))))
-(define finish350
+(define finish342
   (make-struct-type-install-properties
    '(syncer)
    9
@@ -9128,7 +9021,7 @@
    #f
    9
    511))
-(define effect_2176 (finish350 struct:syncer))
+(define effect_2176 (finish342 struct:syncer))
 (define syncer2.1
   (|#%name|
    syncer
@@ -10637,7 +10530,7 @@
                                      (end-atomic)))))))))))))))))
           (retry_0))
          (end-atomic))))))
-(define finish400
+(define finish392
   (make-struct-type-install-properties
    '(evt)
    1
@@ -10655,7 +10548,7 @@
    'replacing-evt))
 (define struct:replacing-evt
   (make-record-type-descriptor* 'evt #f (|#%nongenerative-uid| evt) #f #f 1 0))
-(define effect_2704 (finish400 struct:replacing-evt))
+(define effect_2704 (finish392 struct:replacing-evt))
 (define replacing-evt34.1
   (|#%name|
    replacing-evt
@@ -10689,7 +10582,7 @@
          s
          'evt
          'guard))))))
-(define finish404
+(define finish396
   (make-struct-type-install-properties
    '(evt)
    3
@@ -10706,7 +10599,7 @@
    'nested-sync-evt))
 (define struct:nested-sync-evt
   (make-record-type-descriptor* 'evt #f (|#%nongenerative-uid| evt) #f #f 3 0))
-(define effect_2461 (finish404 struct:nested-sync-evt))
+(define effect_2461 (finish396 struct:nested-sync-evt))
 (define nested-sync-evt35.1
   (|#%name|
    nested-sync-evt
@@ -10906,7 +10799,7 @@
 (define cell.2$3
   (unsafe-make-place-local
    (wrap-evt7.1 (unsafe-place-local-ref cell.1$5) void)))
-(define finish413
+(define finish405
   (make-struct-type-install-properties
    '(system-idle-evt)
    0
@@ -10927,7 +10820,7 @@
    #f
    0
    0))
-(define effect_2195 (finish413 struct:system-idle-evt))
+(define effect_2195 (finish405 struct:system-idle-evt))
 (define system-idle-evt1.1
   (|#%name|
    system-idle-evt
@@ -10967,7 +10860,7 @@
        (wrap-evt7.1 (unsafe-place-local-ref cell.1$5) void)))))
 (define TICKS 100000)
 (define set-schedule-quantum! (lambda (n_0) (set! TICKS n_0)))
-(define finish419
+(define finish411
   (make-struct-type-install-properties
    '(future)
    10
@@ -10988,7 +10881,7 @@
    #f
    10
    1016))
-(define effect_2258 (finish419 struct:future*))
+(define effect_2258 (finish411 struct:future*))
 (define future*1.1
   (|#%name|
    future*
@@ -11070,7 +10963,7 @@
       (if (eq? (unbox lock_0) 0)
         (internal-error "lock release failed!")
         (lock-release lock_0)))))
-(define finish422
+(define finish414
   (make-struct-type-install-properties
    '(future-event)
    6
@@ -11091,7 +10984,7 @@
    #f
    6
    63))
-(define effect_2115 (finish422 struct:future-event))
+(define effect_2115 (finish414 struct:future-event))
 (define future-event1.1
   (|#%name|
    future-event
@@ -11362,7 +11255,7 @@
 (define init-future-place! (lambda () (init-future-logging-place!)))
 (define 1/futures-enabled?
   (|#%name| futures-enabled? (lambda () (begin (|#%app| threaded?)))))
-(define finish437
+(define finish429
   (make-struct-type-install-properties
    '(future-evt)
    1
@@ -11397,7 +11290,7 @@
    #f
    1
    0))
-(define effect_2000 (finish437 struct:future-evt))
+(define effect_2000 (finish429 struct:future-evt))
 (define future-evt1.1
   (|#%name|
    future-evt
@@ -11805,7 +11698,7 @@
                    v_0))))))))))
 (define pthread-count 1)
 (define set-processor-count! (lambda (n_0) (set! pthread-count n_0)))
-(define finish441
+(define finish433
   (make-struct-type-install-properties
    '(scheduler)
    6
@@ -11826,7 +11719,7 @@
    #f
    6
    7))
-(define effect_2657 (finish441 struct:scheduler))
+(define effect_2657 (finish433 struct:scheduler))
 (define scheduler7.1
   (|#%name|
    scheduler
@@ -11851,7 +11744,7 @@
   (|#%name| set-scheduler-futures-head! (record-mutator struct:scheduler 1)))
 (define set-scheduler-futures-tail!
   (|#%name| set-scheduler-futures-tail! (record-mutator struct:scheduler 2)))
-(define finish443
+(define finish435
   (make-struct-type-install-properties
    '(worker)
    5
@@ -11872,7 +11765,7 @@
    #f
    5
    26))
-(define effect_2821 (finish443 struct:worker))
+(define effect_2821 (finish435 struct:worker))
 (define worker8.1
   (|#%name|
    worker
@@ -12699,7 +12592,7 @@
 (define check-place-activity void)
 (define set-check-place-activity!
   (lambda (proc_0) (set! check-place-activity proc_0)))
-(define finish462
+(define finish454
   (make-struct-type-install-properties
    '(alarm-evt)
    1
@@ -12732,7 +12625,7 @@
    #f
    1
    0))
-(define effect_2822 (finish462 struct:alarm-evt))
+(define effect_2822 (finish454 struct:alarm-evt))
 (define alarm-evt1.1
   (|#%name|
    alarm-evt
@@ -13258,7 +13151,7 @@
        (begin (call-with-semaphore/enable-break_0 s_0 proc_0 #f null)))
       ((s_0 proc_0 try-fail12_0 . args_0)
        (call-with-semaphore/enable-break_0 s_0 proc_0 try-fail12_0 args_0))))))
-(define finish467
+(define finish459
   (make-struct-type-install-properties
    '(will-executor)
    2
@@ -13287,7 +13180,7 @@
    #f
    2
    0))
-(define effect_2170 (finish467 struct:will-executor))
+(define effect_2170 (finish459 struct:will-executor))
 (define will-executor1.1
   (|#%name|
    will-executor
@@ -13604,7 +13497,7 @@
           v_0))
        v_0))
    'current-thread-initial-stack-size))
-(define finish471
+(define finish463
   (make-struct-type-install-properties
    '(place-event)
    4
@@ -13625,7 +13518,7 @@
    #f
    4
    15))
-(define effect_2598 (finish471 struct:place-event))
+(define effect_2598 (finish463 struct:place-event))
 (define place-event1.1
   (|#%name|
    place-event
@@ -14288,7 +14181,7 @@
                          (|#%app| (sandman-do-sleep the-sandman) #f))
                         (loop_0)))))))))))
        (loop_0)))))
-(define finish487
+(define finish479
   (make-struct-type-install-properties
    '(place-dead-evt)
    2
@@ -14332,7 +14225,7 @@
    #f
    2
    0))
-(define effect_2480 (finish487 struct:place-done-evt))
+(define effect_2480 (finish479 struct:place-done-evt))
 (define place-done-evt3.1
   (|#%name|
    place-done-evt
@@ -14394,7 +14287,7 @@
            (void)
            (raise-argument-error 'place-dead-evt "place?" p_0))
          (place-done-evt3.1 p_0 #f))))))
-(define finish491
+(define finish483
   (make-struct-type-install-properties
    '(message-queue)
    6
@@ -14415,7 +14308,7 @@
    #f
    6
    22))
-(define effect_2109 (finish491 struct:message-queue))
+(define effect_2109 (finish483 struct:message-queue))
 (define message-queue4.1
   (|#%name|
    message-queue
@@ -14549,7 +14442,7 @@
                       (void))
                     (|#%app| host:mutex-release lock_0)
                     (|#%app| success-k_0 (car q_0))))))))))))
-(define finish495
+(define finish487
   (make-struct-type-install-properties
    '(place-channel)
    6
@@ -14589,7 +14482,7 @@
    #f
    6
    0))
-(define effect_2172 (finish495 struct:pchannel))
+(define effect_2172 (finish487 struct:pchannel))
 (define pchannel5.1
   (|#%name|
    pchannel
@@ -14838,7 +14731,7 @@
       (lambda () (place-has-activity! (unsafe-place-local-ref cell.1$2)))
       (lambda () (ensure-wakeup-handle!))))
     (void)))
-(define finish505
+(define finish497
   (make-struct-type-install-properties
    '(fsemaphore)
    4
@@ -14859,7 +14752,7 @@
    #f
    4
    13))
-(define effect_2528 (finish505 struct:fsemaphore))
+(define effect_2528 (finish497 struct:fsemaphore))
 (define fsemaphore1.1
   (|#%name|
    fsemaphore
@@ -14881,7 +14774,7 @@
   (|#%name| set-fsemaphore-dependents! (record-mutator struct:fsemaphore 2)))
 (define set-fsemaphore-dep-box!
   (|#%name| set-fsemaphore-dep-box! (record-mutator struct:fsemaphore 3)))
-(define finish510
+(define finish502
   (make-struct-type-install-properties
    '(fsemaphore-box-evt)
    1
@@ -14908,7 +14801,7 @@
    #f
    1
    0))
-(define effect_2415 (finish510 struct:fsemaphore-box-evt))
+(define effect_2415 (finish502 struct:fsemaphore-box-evt))
 (define fsemaphore-box-evt2.1
   (|#%name|
    fsemaphore-box-evt
@@ -15083,7 +14976,7 @@
           fork-pthread
           (lambda () (begin (start-atomic) (|#%app| proc_0))))
          (void))))))
-(define finish513
+(define finish505
   (make-struct-type-install-properties
    '(os-semaphore)
    3
@@ -15104,7 +14997,7 @@
    #f
    3
    1))
-(define effect_2703 (finish513 struct:os-semaphore))
+(define effect_2703 (finish505 struct:os-semaphore))
 (define os-semaphore1.1
   (|#%name|
    os-semaphore
diff --git a/racket/src/version/racket_version.h b/racket/src/version/racket_version.h
index d4dffd93d5..0090cfe8a5 100644
--- a/racket/src/version/racket_version.h
+++ b/racket/src/version/racket_version.h
@@ -16,7 +16,7 @@
 #define MZSCHEME_VERSION_X 8
 #define MZSCHEME_VERSION_Y 0
 #define MZSCHEME_VERSION_Z 0
-#define MZSCHEME_VERSION_W 11
+#define MZSCHEME_VERSION_W 12
 
 /* A level of indirection makes `#` work as needed: */
 #define AS_a_STR_HELPER(x) #x