From ebb4ce990e8bab934590e9dfb16e64dc53610700 Mon Sep 17 00:00:00 2001
From: Matthew Flatt <mflatt@racket-lang.org>
Date: Thu, 8 Apr 2021 07:28:49 -0600
Subject: [PATCH] cs: repairs for 'text mode on Windows

Commit 24c6b2450c fixes a problem with 'text mode output, but "io.scm"
needed to be sync'ed for that repair to take effect. The repair
exposed a problem with position counting for 'text mode input, which
is repaied here.

This commit includes a relatively unrelated repair to `_list` and
`_vector`, which was exposed by a combination of the I/O demo
bootstrap and a recent repair for `malloc` to recognizes `_bytes` as a
GCable type.
---
 .../tests/racket/foreign-test.rktl            |    1 +
 pkgs/racket-test-core/tests/racket/port.rktl  |   15 +-
 racket/collects/ffi/unsafe.rkt                |   29 +-
 racket/src/cs/convert.rkt                     |    5 +-
 racket/src/cs/schemified/expander.scm         |  576 ++++----
 racket/src/cs/schemified/io.scm               | 1301 +++++++++--------
 racket/src/cs/schemified/known.scm            |  157 +-
 racket/src/cs/schemified/regexp.scm           |   86 +-
 racket/src/cs/schemified/schemify.scm         |  217 +--
 racket/src/cs/schemified/thread.scm           |  276 ++--
 racket/src/io/port/custom-input-port.rkt      |    6 +-
 racket/src/io/port/fd-port.rkt                |   22 +-
 racket/src/io/port/peek-via-read-port.rkt     |   20 +-
 racket/src/rktio/rktio.def                    |    1 +
 racket/src/rktio/rktio.h                      |    9 +-
 racket/src/rktio/rktio.inc                    |    1 +
 racket/src/rktio/rktio.rktl                   |   12 +
 racket/src/rktio/rktio_fd.c                   |    6 +
 18 files changed, 1489 insertions(+), 1251 deletions(-)

diff --git a/pkgs/racket-test-core/tests/racket/foreign-test.rktl b/pkgs/racket-test-core/tests/racket/foreign-test.rktl
index 6417424a04..51772ebab7 100644
--- a/pkgs/racket-test-core/tests/racket/foreign-test.rktl
+++ b/pkgs/racket-test-core/tests/racket/foreign-test.rktl
@@ -763,6 +763,7 @@
 (test "lo" cast (ptr-add (if (system-big-endian?) #"e\0l\0l\0o\0\0\0" #"\0l\0l\0o\0\0\0") 3) _pointer _string/utf-16)
 (test "lo" cast (ptr-add (share-protect (if (system-big-endian?) #"\0\0\0l\0\0\0l\0\0\0o\0\0\0\0\0\0\0\0" #"\0\0\0\0l\0\0\0o\0\0\0\0\0\0\0")) 4)
       _pointer _string/ucs-4)
+(test #t cpointer-gcable? (cast '(#"apple") (_list i _bytes) _gcpointer))
 (test #t
       'many-casts
       (for/and ([i (in-range 1000)])
diff --git a/pkgs/racket-test-core/tests/racket/port.rktl b/pkgs/racket-test-core/tests/racket/port.rktl
index ace0c7b671..f5d469174c 100644
--- a/pkgs/racket-test-core/tests/racket/port.rktl
+++ b/pkgs/racket-test-core/tests/racket/port.rktl
@@ -1011,17 +1011,14 @@
   (test 'line file-stream-buffer-mode ofile)
   (close-output-port ofile)
 
-  (let ()
-    (define ifile (open-input-file path #:mode 'text))
-    (test "abc" read-line ifile)
-    (define pos (file-position ifile))
-    (test "def" read-line ifile)
-    (file-position ifile pos)
-    (test "def" read-line ifile))
+  (test (if (eq? 'windows (system-type))
+            #"abc\r\ndef\r\nghi\r\n"
+            #"abc\ndef\nghi\n")
+        call-with-input-file path (lambda (i) (read-bytes 100 i)))
 
-  (let ()
+  (for ([i '(none block)])
     (define ifile (open-input-file path #:mode 'text))
-    (file-stream-buffer-mode ifile 'none)
+    (file-stream-buffer-mode ifile)
     (test "abc" read-line ifile)
     (define pos (file-position ifile))
     (test "def" read-line ifile)
diff --git a/racket/collects/ffi/unsafe.rkt b/racket/collects/ffi/unsafe.rkt
index 3b206ec178..cd2ce5c4a9 100644
--- a/racket/collects/ffi/unsafe.rkt
+++ b/racket/collects/ffi/unsafe.rkt
@@ -1123,20 +1123,20 @@
 (provide _list)
 (define-fun-syntax _list
   (syntax-rules/symbol-literals (i o io)
-    [(_ i  t  )      (type: _pointer
+    [(_ i  t  )      (type: _gcpointer
                       pre:  (x => (list->cblock x t)))]
-    [(_ i  t mode)   (type: _pointer
+    [(_ i  t mode)   (type: (malloc-mode-type mode)
                       pre:  (x => (list->cblock x t #:malloc-mode (check-malloc-mode _list mode))))]
-    [(_ o  t n)      (type: _pointer
+    [(_ o  t n)      (type: _gcpointer
                       pre:  (malloc n t)
                       post: (x => (cblock->list x t n)))]
-    [(_ o  t n mode) (type: _pointer
+    [(_ o  t n mode) (type: (malloc-mode-type mode)
                       pre:  (malloc n t (check-malloc-mode _list mode))
                       post: (x => (cblock->list x t n)))]
-    [(_ io t n)      (type: _pointer
+    [(_ io t n)      (type: _gcpointer
                       pre:  (x => (list->cblock x t))
                       post: (x => (cblock->list x t n)))]
-    [(_ io t n mode) (type: _pointer
+    [(_ io t n mode) (type: (malloc-mode-type mode)
                       pre:  (x => (list->cblock x t #:malloc-mode (check-malloc-mode _list mode)))
                       post: (x => (cblock->list x t n)))]))
 
@@ -1145,20 +1145,20 @@
 (provide _vector)
 (define-fun-syntax _vector
   (syntax-rules/symbol-literals (i o io)
-    [(_ i  t  )      (type: _pointer
+    [(_ i  t  )      (type: _gcpointer
                       pre:  (x => (vector->cblock x t)))]
-    [(_ i  t mode)   (type: _pointer
+    [(_ i  t mode)   (type: (malloc-mode-type mode)
                       pre:  (x => (vector->cblock x t #:malloc-mode (check-malloc-mode _vector mode))))]
-    [(_ o  t n)      (type: _pointer
+    [(_ o  t n)      (type: _gcpointer
                       pre:  (malloc n t)
                       post: (x => (cblock->vector x t n)))]
-    [(_ o  t n mode) (type: _pointer
+    [(_ o  t n mode) (type: (malloc-mode-type mode)
                       pre:  (malloc n t (check-malloc-mode _vector mode))
                       post: (x => (cblock->vector x t n)))]
-    [(_ io t n)      (type: _pointer
+    [(_ io t n)      (type: _gcpointer
                       pre:  (x => (vector->cblock x t))
                       post: (x => (cblock->vector x t n)))]
-    [(_ io t n mode) (type: _pointer
+    [(_ io t n mode) (type: (malloc-mode-type mode)
                       pre:  (x => (vector->cblock x t #:malloc-mode (check-malloc-mode _vector mode)))
                       post: (x => (cblock->vector x t n)))]))
 
@@ -1175,6 +1175,11 @@
                          "invalid malloc mode"
                          #'mode)]))
 
+(define-syntax (malloc-mode-type stx)
+  (syntax-case stx (raw)
+    [(_ raw) #'_pointer]
+    [_ #'_gcpointer]))
+
 ;; Reflect the difference between 'racket and 'chez-scheme
 ;; VMs for `_bytes` in `_bytes*`:
 (define _pointer/maybe-gcable
diff --git a/racket/src/cs/convert.rkt b/racket/src/cs/convert.rkt
index 80b622d537..a9734ddf5e 100644
--- a/racket/src/cs/convert.rkt
+++ b/racket/src/cs/convert.rkt
@@ -270,7 +270,10 @@
         [`(define ,id ,rhs)
          (if (or (eqv? 1 (hash-ref counts id))
                  (and (wrap-property rhs 'inferred-name)
-                      (not (hash-ref export-counts id #f))))
+                      (not (hash-ref export-counts id #f)))
+                 (match rhs
+                   [`(make-struct-type-install-properties . ,_) #t]
+                   [_ #f]))
              (add-new-names id env #:top? #t #:count-from (expression-shape rhs))
              env)]
         [`(define-values ,ids ,rhs)
diff --git a/racket/src/cs/schemified/expander.scm b/racket/src/cs/schemified/expander.scm
index 7ca43a3f87..70bb72fae8 100644
--- a/racket/src/cs/schemified/expander.scm
+++ b/racket/src/cs/schemified/expander.scm
@@ -2799,13 +2799,13 @@
         (let ((app_1 (|#%app| range-ref v_0 0)))
           (values values #f app_0 app_1 (|#%app| range-ref v_0 2) #f #f))))))))
 (define check-range
-  (lambda (a_0 b_0 step_0)
+  (lambda (a_0 b_0 step_0) (check-range-generic 'in-range a_0 b_0 step_0)))
+(define check-range-generic
+  (lambda (who_0 a_0 b_0 step_0)
     (begin
-      (if (real? a_0) (void) (raise-argument-error 'in-range "real?" a_0))
-      (if (real? b_0) (void) (raise-argument-error 'in-range "real?" b_0))
-      (if (real? step_0)
-        (void)
-        (raise-argument-error 'in-range "real?" step_0)))))
+      (if (real? a_0) (void) (raise-argument-error who_0 "real?" a_0))
+      (if (real? b_0) (void) (raise-argument-error who_0 "real?" b_0))
+      (if (real? step_0) (void) (raise-argument-error who_0 "real?" step_0)))))
 (define check-naturals
   (lambda (n_0)
     (if (if (integer? n_0) (if (exact? n_0) (>= n_0 0) #f) #f)
@@ -3483,6 +3483,18 @@
             void
             (lambda () (|#%app| proc46_0 p_0))
             (lambda () (close-input-port p_0)))))))))
+(define print-value-columns
+  (make-parameter
+   +inf.0
+   (lambda (c_0)
+     (if (let ((or-part_0 (eqv? c_0 +inf.0)))
+           (if or-part_0 or-part_0 (if (exact-integer? c_0) (> c_0 5) #f)))
+       c_0
+       (raise-argument-error
+        'print-value-columns
+        "(or/c +inf.0 (and/c exact-integer? (>/c 5)))"
+        c_0)))
+   'print-value-columns))
 (define the-empty-hash hash2725)
 (define the-empty-hasheq hash2610)
 (define the-empty-hasheqv hash2589)
@@ -3887,7 +3899,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 finish101
+(define finish_2439
   (make-struct-type-install-properties
    '(region)
    5
@@ -3908,7 +3920,7 @@
    #f
    5
    30))
-(define effect_2980 (finish101 struct:region))
+(define effect_2980 (finish_2439 struct:region))
 (define region1.1
   (|#%name|
    region
@@ -4069,7 +4081,7 @@
          v
          'region
          'as-nested-memory))))))
-(define finish113
+(define finish_2300
   (make-struct-type-install-properties
    '(stat)
    3
@@ -4090,7 +4102,7 @@
    #f
    3
    7))
-(define effect_2500 (finish113 struct:stat))
+(define effect_2500 (finish_2300 struct:stat))
 (define stat2.1
   (|#%name|
    stat
@@ -5370,7 +5382,7 @@
             (for-loop_0 0 start_0))))
         #f)
       #f)))
-(define finish151
+(define finish_2792
   (make-struct-type-install-properties
    '(weak-intern-table)
    1
@@ -5391,7 +5403,7 @@
    #f
    1
    0))
-(define effect_2507 (finish151 struct:weak-intern-table))
+(define effect_2507 (finish_2792 struct:weak-intern-table))
 (define weak-intern-table1.1
   (|#%name|
    weak-intern-table
@@ -5403,7 +5415,7 @@
   (|#%name|
    weak-intern-table-box
    (record-accessor struct:weak-intern-table 0)))
-(define finish153
+(define finish_2969
   (make-struct-type-install-properties
    '(table)
    3
@@ -5424,7 +5436,7 @@
    #f
    3
    0))
-(define effect_2522 (finish153 struct:table))
+(define effect_2522 (finish_2969 struct:table))
 (define table2.1
   (|#%name|
    table
@@ -5604,7 +5616,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 finish157
+(define finish_2266
   (make-struct-type-install-properties
    '(resolved-module-path)
    1
@@ -5654,7 +5666,7 @@
    #f
    1
    0))
-(define effect_2442 (finish157 struct:resolved-module-path))
+(define effect_2442 (finish_2266 struct:resolved-module-path))
 (define resolved-module-path1.1
   (|#%name|
    resolved-module-path
@@ -5785,7 +5797,7 @@
           (if (pair? name_0)
             (list* 'submod root-mod-path_0 (cdr name_0))
             root-mod-path_0))))))
-(define finish160
+(define finish_2578
   (make-struct-type-install-properties
    '(module-path-index)
    4
@@ -5918,7 +5930,7 @@
    #f
    4
    12))
-(define effect_2892 (finish160 struct:module-path-index))
+(define effect_2892 (finish_2578 struct:module-path-index))
 (define module-path-index2.1
   (|#%name|
    module-path-index
@@ -6480,7 +6492,7 @@
          (if (pair? default-name_0)
            (cons root-name_0 (cdr default-name_0))
            root-name_0))))))
-(define finish172
+(define finish_2890
   (make-struct-type-install-properties
    '(promise)
    2
@@ -6501,7 +6513,7 @@
    #f
    2
    3))
-(define effect_2268 (finish172 struct:promise))
+(define effect_2268 (finish_2890 struct:promise))
 (define promise1.1
   (|#%name|
    promise
@@ -6547,7 +6559,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 finish174
+(define finish_3075
   (make-struct-type-install-properties
    '(serialize-state)
    14
@@ -6568,7 +6580,7 @@
    #f
    14
    0))
-(define effect_2707 (finish174 struct:serialize-state))
+(define effect_2707 (finish_3075 struct:serialize-state))
 (define serialize-state1.1
   (|#%name|
    serialize-state
@@ -7178,7 +7190,7 @@
                     (if (hash? d_0)
                       (if (immutable? d_0) (positive? (hash-count d_0)) #f)
                       #f)))))))))))
-(define finish189
+(define finish_2102
   (make-struct-type-install-properties
    '(preserved-property-value)
    1
@@ -7199,7 +7211,7 @@
    #f
    1
    0))
-(define effect_2588 (finish189 struct:preserved-property-value))
+(define effect_2588 (finish_2102 struct:preserved-property-value))
 (define preserved-property-value1.1
   (|#%name|
    preserved-property-value
@@ -7391,7 +7403,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 finish197
+(define finish_2619
   (make-struct-type-install-properties
    '(modified-content)
    2
@@ -7412,7 +7424,7 @@
    #f
    2
    0))
-(define effect_2176 (finish197 struct:modified-content))
+(define effect_2176 (finish_2619 struct:modified-content))
 (define modified-content1.1
   (|#%name|
    modified-content
@@ -7428,7 +7440,7 @@
   (|#%name|
    modified-content-scope-propagations+tamper
    (record-accessor struct:modified-content 1)))
-(define finish199
+(define finish_1913
   (make-struct-type-install-properties
    '(syntax)
    7
@@ -7697,7 +7709,7 @@
    #f
    7
    1))
-(define effect_2447 (finish199 struct:syntax))
+(define effect_2447 (finish_1913 struct:syntax))
 (define syntax2.1
   (|#%name|
    syntax
@@ -8044,7 +8056,7 @@
       s_0))))
 (define syntax-place-init!
   (lambda () (unsafe-place-local-set! cell.1$7 (make-weak-hasheq))))
-(define finish225
+(define finish_2442
   (make-struct-type-install-properties
    '(syntax-state)
    3
@@ -8065,7 +8077,7 @@
    #f
    3
    1))
-(define effect_2710 (finish225 struct:syntax-state))
+(define effect_2710 (finish_2442 struct:syntax-state))
 (define syntax-state17.1
   (|#%name|
    syntax-state
@@ -8170,7 +8182,7 @@
             #f
             inspector_0)))
       (datum->syntax$1 s_0 content_0 s_0 s_0))))
-(define finish231
+(define finish_2247
   (make-struct-type-install-properties
    '(full-binding)
    2
@@ -8193,7 +8205,7 @@
    #f
    2
    0))
-(define effect_2734 (finish231 struct:full-binding))
+(define effect_2734 (finish_2247 struct:full-binding))
 (define full-binding1.1
   (|#%name|
    full-binding
@@ -8346,7 +8358,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 finish233
+(define finish_2771
   (make-struct-type-install-properties
    '(full-module-binding)
    9
@@ -8407,7 +8419,7 @@
    #f
    9
    0))
-(define effect_2481 (finish233 struct:full-module-binding))
+(define effect_2481 (finish_2771 struct:full-module-binding))
 (define full-module-binding45.1
   (|#%name|
    full-module-binding
@@ -8453,7 +8465,7 @@
   (|#%name|
    full-module-binding-extra-nominal-bindings
    (record-accessor struct:full-module-binding 8)))
-(define finish235
+(define finish_2371
   (make-struct-type-install-properties
    '(simple-module-binding)
    4
@@ -8484,7 +8496,7 @@
    #f
    4
    0))
-(define effect_2891 (finish235 struct:simple-module-binding))
+(define effect_2891 (finish_2371 struct:simple-module-binding))
 (define simple-module-binding46.1
   (|#%name|
    simple-module-binding
@@ -8582,7 +8594,7 @@
       null
       (full-module-binding-extra-nominal-bindings b_0))))
 (define empty-binding-table hash2610)
-(define finish237
+(define finish_2494
   (make-struct-type-install-properties
    '(table-with-bulk-bindings)
    3
@@ -8613,7 +8625,7 @@
    #f
    3
    0))
-(define effect_2950 (finish237 struct:table-with-bulk-bindings))
+(define effect_2950 (finish_2494 struct:table-with-bulk-bindings))
 (define table-with-bulk-bindings1.1
   (|#%name|
    table-with-bulk-bindings
@@ -8641,7 +8653,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 finish239
+(define finish_2866
   (make-struct-type-install-properties
    '(bulk-binding-at)
    2
@@ -8673,7 +8685,7 @@
    #f
    2
    0))
-(define effect_2253 (finish239 struct:bulk-binding-at))
+(define effect_2253 (finish_2866 struct:bulk-binding-at))
 (define bulk-binding-at2.1
   (|#%name|
    bulk-binding-at
@@ -8690,7 +8702,7 @@
 (define-values
  (prop:bulk-binding bulk-binding?$1 bulk-binding-ref)
  (make-struct-type-property 'bulk-binding))
-(define finish242
+(define finish_2649
   (make-struct-type-install-properties
    '(bulk-binding-class)
    3
@@ -8711,7 +8723,7 @@
    #f
    3
    0))
-(define effect_2841 (finish242 struct:bulk-binding-class))
+(define effect_2841 (finish_2649 struct:bulk-binding-class))
 (define bulk-binding-class3.1
   (|#%name|
    bulk-binding-class
@@ -10237,7 +10249,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 finish296
+(define finish_2185
   (make-struct-type-install-properties
    '(fallback)
    1
@@ -10258,7 +10270,7 @@
    #f
    1
    1))
-(define effect_2114 (finish296 struct:fallback))
+(define effect_2114 (finish_2185 struct:fallback))
 (define fallback1.1
   (|#%name|
    fallback
@@ -10359,7 +10371,7 @@
       (begin
         (if c_0 (hash-clear! c_0) (void))
         (unsafe-set-box*! (unsafe-place-local-ref cell.2$3) #f))))))
-(define finish300
+(define finish_2822
   (make-struct-type-install-properties
    '(entry)
    4
@@ -10380,7 +10392,7 @@
    #f
    4
    0))
-(define effect_2728 (finish300 struct:entry))
+(define effect_2728 (finish_2822 struct:entry))
 (define entry1.1
   (|#%name|
    entry
@@ -10421,7 +10433,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 finish302
+(define finish_2410
   (make-struct-type-install-properties
    '(shifted-entry)
    3
@@ -10442,7 +10454,7 @@
    #f
    3
    0))
-(define effect_2358 (finish302 struct:shifted-entry))
+(define effect_2358 (finish_2410 struct:shifted-entry))
 (define shifted-entry2.1
   (|#%name|
    shifted-entry
@@ -10631,7 +10643,7 @@
             s_0))))))
 (define cache-place-init!
   (lambda () (begin (resolve-cache-place-init!) (sets-place-init!))))
-(define finish304
+(define finish_3056
   (make-struct-type-install-properties
    '(scope)
    3
@@ -10701,7 +10713,7 @@
    #f
    3
    4))
-(define effect_2269 (finish304 struct:scope))
+(define effect_2269 (finish_3056 struct:scope))
 (define scope1.1
   (|#%name|
    scope
@@ -10721,7 +10733,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 finish308
+(define finish_2547
   (make-struct-type-install-properties
    '(interned-scope)
    1
@@ -10764,7 +10776,7 @@
    #f
    1
    0))
-(define effect_2498 (finish308 struct:interned-scope))
+(define effect_2498 (finish_2547 struct:interned-scope))
 (define interned-scope2.1
   (|#%name|
    interned-scope
@@ -10774,7 +10786,7 @@
   (|#%name| interned-scope? (record-predicate struct:interned-scope)))
 (define interned-scope-key
   (|#%name| interned-scope-key (record-accessor struct:interned-scope 0)))
-(define finish312
+(define finish_1876
   (make-struct-type-install-properties
    '(multi-scope)
    5
@@ -10902,7 +10914,7 @@
    #f
    5
    0))
-(define effect_1895 (finish312 struct:multi-scope))
+(define effect_1895 (finish_1876 struct:multi-scope))
 (define multi-scope3.1
   (|#%name|
    multi-scope
@@ -10926,7 +10938,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 finish319
+(define finish_3510
   (make-struct-type-install-properties
    '(representative-scope)
    2
@@ -10985,7 +10997,7 @@
    #f
    2
    3))
-(define effect_2683 (finish319 struct:representative-scope))
+(define effect_2683 (finish_3510 struct:representative-scope))
 (define representative-scope4.1
   (|#%name|
    representative-scope
@@ -11026,7 +11038,7 @@
     (begin
       (begin-unsafe (set-scope-binding-table! s_0 bt_0))
       (set-representative-scope-owner! s_0 owner_0))))
-(define finish323
+(define finish_3292
   (make-struct-type-install-properties
    '(shifted-multi-scope)
    2
@@ -11074,7 +11086,7 @@
    #f
    2
    0))
-(define effect_2854 (finish323 struct:shifted-multi-scope))
+(define effect_2854 (finish_3292 struct:shifted-multi-scope))
 (define shifted-multi-scope5.1
   (|#%name|
    shifted-multi-scope
@@ -11138,7 +11150,7 @@
             (multi-scope-label-shifted multi-scope_0)
             phase_0
             (lambda () (shifted-multi-scope5.1 phase_0 multi-scope_0)))))))))
-(define finish326
+(define finish_3013
   (make-struct-type-install-properties
    '(shifted-to-label-phase)
    1
@@ -11159,7 +11171,7 @@
    #f
    1
    1))
-(define effect_2315 (finish326 struct:shifted-to-label-phase))
+(define effect_2315 (finish_3013 struct:shifted-to-label-phase))
 (define shifted-to-label-phase6.1
   (|#%name|
    shifted-to-label-phase
@@ -12002,7 +12014,7 @@
                                                 (gf_0 #f s_2)))))))))))))
                            (loop_1 #f s_1 0)))))))))
                (loop_0 s_0)))))))))
-(define finish401
+(define finish_2712
   (make-struct-type-install-properties
    '(propagation)
    7
@@ -12030,7 +12042,7 @@
    #f
    7
    0))
-(define effect_2326 (finish401 struct:propagation))
+(define effect_2326 (finish_2712 struct:propagation))
 (define propagation12.1
   (|#%name|
    propagation
@@ -13379,7 +13391,7 @@
   (lambda (b_0)
     (let ((or-part_0 (full-local-binding? b_0)))
       (if or-part_0 or-part_0 (symbol? b_0)))))
-(define finish473
+(define finish_2041
   (make-struct-type-install-properties
    '(full-local-binding)
    1
@@ -13408,7 +13420,7 @@
    #f
    1
    0))
-(define effect_3011 (finish473 struct:full-local-binding))
+(define effect_3011 (finish_2041 struct:full-local-binding))
 (define full-local-binding1.1
   (|#%name|
    full-local-binding
@@ -13514,7 +13526,7 @@
                        "given"
                        id_0))
                     id_0)))))))))))
-(define finish476
+(define finish_2476
   (make-struct-type-install-properties
    '(rename-transformer)
    1
@@ -13535,7 +13547,7 @@
    #f
    1
    0))
-(define effect_2525 (finish476 struct:id-rename-transformer))
+(define effect_2525 (finish_2476 struct:id-rename-transformer))
 (define id-rename-transformer1.1
   (|#%name|
    id-rename-transformer
@@ -13758,7 +13770,7 @@
          unsafe-undefined
          b_0)
         (error "bad binding for free=id:" b_0)))))
-(define finish495
+(define finish_2455
   (make-struct-type-install-properties
    '(non-source-shift)
    2
@@ -13779,7 +13791,7 @@
    #f
    2
    3))
-(define effect_3061 (finish495 struct:non-source-shift))
+(define effect_3061 (finish_2455 struct:non-source-shift))
 (define non-source-shift4.1
   (|#%name|
    non-source-shift
@@ -14306,7 +14318,7 @@
                 (syntax-props the-struct_0)
                 (syntax-inspector the-struct_0)))
              (raise-argument-error 'struct-copy "syntax?" the-struct_0))))))))
-(define finish502
+(define finish_3200
   (make-struct-type-install-properties
    '(provided)
    3
@@ -14336,7 +14348,7 @@
    #f
    3
    0))
-(define effect_2629 (finish502 struct:provided))
+(define effect_2629 (finish_3200 struct:provided))
 (define provided1.1
   (|#%name|
    provided
@@ -14390,7 +14402,7 @@
                   unsafe-undefined
                   unsafe-undefined
                   binding_0))))))))))
-(define finish504
+(define finish_2466
   (make-struct-type-install-properties
    '(bulk-binding)
    8
@@ -14512,7 +14524,7 @@
    #f
    8
    9))
-(define effect_2834 (finish504 struct:bulk-binding))
+(define effect_2834 (finish_2466 struct:bulk-binding))
 (define bulk-binding12.1
   (|#%name|
    bulk-binding
@@ -14622,7 +14634,7 @@
   (lambda (b_0 mpi-shifts_0)
     (1/module-path-index-resolve
      (apply-syntax-shifts (bulk-binding-mpi b_0) mpi-shifts_0))))
-(define finish512
+(define finish_2579
   (make-struct-type-install-properties
    '(bulk-provide)
    2
@@ -14643,7 +14655,7 @@
    #f
    2
    0))
-(define effect_2392 (finish512 struct:bulk-provide))
+(define effect_2392 (finish_2579 struct:bulk-provide))
 (define bulk-provide13.1
   (|#%name|
    bulk-provide
@@ -14693,7 +14705,7 @@
          s
          'bulk-provide
          'provides))))))
-(define finish517
+(define finish_2603
   (make-struct-type-install-properties
    '(bulk-binding-registry)
    1
@@ -14714,7 +14726,7 @@
    #f
    1
    0))
-(define effect_2403 (finish517 struct:bulk-binding-registry))
+(define effect_2403 (finish_2603 struct:bulk-binding-registry))
 (define bulk-binding-registry14.1
   (|#%name|
    bulk-binding-registry
@@ -14767,7 +14779,7 @@
       #t
       #f)))
 (define generate-lift-key (lambda () (gensym 'lift)))
-(define finish521
+(define finish_2813
   (make-struct-type-install-properties
    '(root-expand-context)
    4
@@ -14788,7 +14800,7 @@
    #f
    4
    0))
-(define effect_2124 (finish521 struct:root-expand-context/outer))
+(define effect_2124 (finish_2813 struct:root-expand-context/outer))
 (define root-expand-context/outer1.1
   (|#%name|
    root-expand-context/outer
@@ -14817,7 +14829,7 @@
   (|#%name|
    root-expand-context-frame-id
    (record-accessor struct:root-expand-context/outer 3)))
-(define finish523
+(define finish_2837
   (make-struct-type-install-properties
    '(root-expand-context/inner)
    7
@@ -14838,7 +14850,7 @@
    #f
    7
    0))
-(define effect_2880 (finish523 struct:root-expand-context/inner))
+(define effect_2880 (finish_2837 struct:root-expand-context/inner))
 (define root-expand-context/inner2.1
   (|#%name|
    root-expand-context/inner
@@ -15376,7 +15388,7 @@
        (error
         "broken '#%linklet primitive table; maybe you need to use \"bootstrap-run.rkt\"")))
     (void)))
-(define finish561
+(define finish_2938
   (make-struct-type-install-properties
    '(module-registry)
    2
@@ -15397,7 +15409,7 @@
    #f
    2
    0))
-(define effect_2565 (finish561 struct:module-registry))
+(define effect_2565 (finish_2938 struct:module-registry))
 (define module-registry1.1
   (|#%name|
    module-registry
@@ -15496,7 +15508,7 @@
                            (if or-part_0 or-part_0 never-evt))))
                       (loop_0))))))))))
        (loop_0)))))
-(define finish571
+(define finish_2468
   (make-struct-type-install-properties
    '(namespace)
    15
@@ -15542,7 +15554,7 @@
    #f
    15
    4096))
-(define effect_3128 (finish571 struct:namespace))
+(define effect_3128 (finish_2468 struct:namespace))
 (define namespace1.1
   (|#%name|
    namespace
@@ -15591,7 +15603,7 @@
   (|#%name| namespace-module-instances (record-accessor struct:namespace 14)))
 (define set-namespace-inspector!
   (|#%name| set-namespace-inspector! (record-mutator struct:namespace 12)))
-(define finish575
+(define finish_2741
   (make-struct-type-install-properties
    '(definitions)
    2
@@ -15612,7 +15624,7 @@
    #f
    2
    0))
-(define effect_2319 (finish575 struct:definitions))
+(define effect_2319 (finish_2741 struct:definitions))
 (define definitions2.1
   (|#%name|
    definitions
@@ -16122,7 +16134,7 @@
                       (for-loop_0 new-stx_2 rest_0))))
                 new-stx_1))))))
        (for-loop_0 new-stx_0 old-stxes_0)))))
-(define finish619
+(define finish_2245
   (make-struct-type-install-properties
    '(syntax-binding-set)
    1
@@ -16143,7 +16155,7 @@
    #f
    1
    0))
-(define effect_2582 (finish619 struct:syntax-binding-set))
+(define effect_2582 (finish_2245 struct:syntax-binding-set))
 (define syntax-binding-set1.1
   (|#%name|
    syntax-binding-set
@@ -16179,7 +16191,7 @@
          s
          'syntax-binding-set
          'binds))))))
-(define finish623
+(define finish_2672
   (make-struct-type-install-properties
    '(bind)
    3
@@ -16200,7 +16212,7 @@
    #f
    3
    0))
-(define effect_2584 (finish623 struct:bind))
+(define effect_2584 (finish_2672 struct:bind))
 (define bind2.1
   (|#%name|
    bind
@@ -16651,7 +16663,7 @@
 (define current-previously-unbound (lambda () #f))
 (define set-current-previously-unbound!
   (lambda (proc_0) (set! current-previously-unbound proc_0)))
-(define finish634
+(define finish_2737
   (make-struct-type-install-properties
    '(module-use)
    2
@@ -16708,7 +16720,7 @@
    #f
    2
    0))
-(define effect_2097 (finish634 struct:module-use))
+(define effect_2097 (finish_2737 struct:module-use))
 (define module-use1.1
   (|#%name|
    module-use
@@ -16756,7 +16768,7 @@
          s
          'module-use
          'phase))))))
-(define finish642
+(define finish_2673
   (make-struct-type-install-properties
    '(module)
    20
@@ -16777,7 +16789,7 @@
    #f
    20
    16))
-(define effect_2640 (finish642 struct:module))
+(define effect_2640 (finish_2673 struct:module))
 (define module1.1
   (|#%name|
    module
@@ -16827,7 +16839,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 finish644
+(define finish_2550
   (make-struct-type-install-properties
    '(module-linklet-info)
    6
@@ -16848,7 +16860,7 @@
    #f
    6
    0))
-(define effect_2508 (finish644 struct:module-linklet-info))
+(define effect_2508 (finish_2550 struct:module-linklet-info))
 (define module-linklet-info2.1
   (|#%name|
    module-linklet-info
@@ -16940,7 +16952,7 @@
                 submodule-names18_0
                 supermodule-name19_0
                 get-all-variables_0)))))))))
-(define finish647
+(define finish_2326
   (make-struct-type-install-properties
    '(module-instance)
    7
@@ -16961,7 +16973,7 @@
    #f
    7
    52))
-(define effect_2382 (finish647 struct:module-instance))
+(define effect_2382 (finish_2326 struct:module-instance))
 (define module-instance40.1
   (|#%name|
    module-instance
@@ -18504,7 +18516,7 @@
                   (lambda (s_0) (error "bad syntax:" s_0)))))
             (lambda (t_0) v_0))))))))
 (define 1/make-set!-transformer
-  (let ((finish747
+  (let ((finish759
          (make-struct-type-install-properties
           '(set!-transformer)
           1
@@ -18518,7 +18530,7 @@
           'set!-transformer)))
     (let ((struct:set!-transformer_0
            (make-record-type-descriptor* 'set!-transformer #f #f #f #f 1 0)))
-      (let ((effect748 (finish747 struct:set!-transformer_0)))
+      (let ((effect760 (finish759 struct:set!-transformer_0)))
         (let ((set!-transformer1_0
                (|#%name|
                 set!-transformer
@@ -18591,7 +18603,7 @@
   (lambda (t_0)
     (let ((or-part_0 (eq? t_0 variable)))
       (if or-part_0 or-part_0 (local-variable? t_0)))))
-(define finish750
+(define finish_2125
   (make-struct-type-install-properties
    '(local-variable)
    1
@@ -18612,7 +18624,7 @@
    #f
    1
    0))
-(define effect_2625 (finish750 struct:local-variable))
+(define effect_2625 (finish_2125 struct:local-variable))
 (define local-variable1.1
   (|#%name|
    local-variable
@@ -18657,7 +18669,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 finish753
+(define finish_2414
   (make-struct-type-install-properties
    '(core-form)
    2
@@ -18678,7 +18690,7 @@
    #f
    2
    0))
-(define effect_2077 (finish753 struct:core-form))
+(define effect_2077 (finish_2414 struct:core-form))
 (define core-form7.1
   (|#%name|
    core-form
@@ -18953,7 +18965,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 finish765
+(define finish_2652
   (make-struct-type-install-properties
    '(expand-context)
    11
@@ -18974,7 +18986,7 @@
    #f
    11
    0))
-(define effect_2851 (finish765 struct:expand-context/outer))
+(define effect_2851 (finish_2652 struct:expand-context/outer))
 (define expand-context/outer1.1
   (|#%name|
    expand-context/outer
@@ -19026,7 +19038,7 @@
   (|#%name|
    expand-context-name
    (record-accessor struct:expand-context/outer 10)))
-(define finish767
+(define finish_2648
   (make-struct-type-install-properties
    '(expand-context/inner)
    22
@@ -19047,7 +19059,7 @@
    #f
    22
    0))
-(define effect_3326 (finish767 struct:expand-context/inner))
+(define effect_3326 (finish_2648 struct:expand-context/inner))
 (define expand-context/inner2.1
   (|#%name|
    expand-context/inner
@@ -21482,7 +21494,7 @@
                        fold-var_0))))))
               (for-loop_0 null s_0)))))
         s_0))))
-(define finish927
+(define finish_2958
   (make-struct-type-install-properties
    '(compile-context)
    7
@@ -21503,7 +21515,7 @@
    #f
    7
    0))
-(define effect_2620 (finish927 struct:compile-context))
+(define effect_2620 (finish_2958 struct:compile-context))
 (define compile-context1.1
   (|#%name|
    compile-context
@@ -23978,7 +23990,7 @@
   (lambda (i_0)
     (let ((len_0 (|#%app| read-fasl-integer i_0)))
       (read-bytes/exactly len_0 i_0))))
-(define finish1075
+(define finish_2322
   (make-struct-type-install-properties
    '(mpi-intern-table)
    2
@@ -23999,7 +24011,7 @@
    #f
    2
    0))
-(define effect_2611 (finish1075 struct:mpi-intern-table))
+(define effect_2611 (finish_2322 struct:mpi-intern-table))
 (define mpi-intern-table1.1
   (|#%name|
    mpi-intern-table
@@ -24234,7 +24246,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 finish1084
+(define finish_2005
   (make-struct-type-install-properties
    '(module-path-index-table)
    2
@@ -24255,7 +24267,7 @@
    #f
    2
    0))
-(define effect_2626 (finish1084 struct:module-path-index-table))
+(define effect_2626 (finish_2005 struct:module-path-index-table))
 (define module-path-index-table1.1
   (|#%name|
    module-path-index-table
@@ -28341,7 +28353,7 @@
    module-use1.1
    'deserialize
    deserialize))
-(define finish1186
+(define finish_2891
   (make-struct-type-install-properties
    '(parsed)
    1
@@ -28362,7 +28374,7 @@
    #f
    1
    0))
-(define effect_3056 (finish1186 struct:parsed))
+(define effect_3056 (finish_2891 struct:parsed))
 (define parsed1.1
   (|#%name|
    parsed
@@ -28370,7 +28382,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 finish1188
+(define finish_2783
   (make-struct-type-install-properties
    '(parsed-id)
    2
@@ -28391,7 +28403,7 @@
    #f
    2
    0))
-(define effect_2596 (finish1188 struct:parsed-id))
+(define effect_2596 (finish_2783 struct:parsed-id))
 (define parsed-id2.1
   (|#%name|
    parsed-id
@@ -28402,7 +28414,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 finish1190
+(define finish_2627
   (make-struct-type-install-properties
    '(parsed-primitive-id)
    0
@@ -28423,7 +28435,7 @@
    #f
    0
    0))
-(define effect_2448 (finish1190 struct:parsed-primitive-id))
+(define effect_2448 (finish_2627 struct:parsed-primitive-id))
 (define parsed-primitive-id3.1
   (|#%name|
    parsed-primitive-id
@@ -28433,7 +28445,7 @@
   (|#%name|
    parsed-primitive-id?
    (record-predicate struct:parsed-primitive-id)))
-(define finish1192
+(define finish_2584
   (make-struct-type-install-properties
    '(parsed-top-id)
    0
@@ -28454,7 +28466,7 @@
    #f
    0
    0))
-(define effect_2581 (finish1192 struct:parsed-top-id))
+(define effect_2581 (finish_2584 struct:parsed-top-id))
 (define parsed-top-id4.1
   (|#%name|
    parsed-top-id
@@ -28462,7 +28474,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 finish1194
+(define finish_2495
   (make-struct-type-install-properties
    '(parsed-lambda)
    2
@@ -28483,7 +28495,7 @@
    #f
    2
    0))
-(define effect_2349 (finish1194 struct:parsed-lambda))
+(define effect_2349 (finish_2495 struct:parsed-lambda))
 (define parsed-lambda5.1
   (|#%name|
    parsed-lambda
@@ -28495,7 +28507,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 finish1196
+(define finish_2679
   (make-struct-type-install-properties
    '(parsed-case-lambda)
    1
@@ -28516,7 +28528,7 @@
    #f
    1
    0))
-(define effect_2437 (finish1196 struct:parsed-case-lambda))
+(define effect_2437 (finish_2679 struct:parsed-case-lambda))
 (define parsed-case-lambda6.1
   (|#%name|
    parsed-case-lambda
@@ -28528,7 +28540,7 @@
   (|#%name|
    parsed-case-lambda-clauses
    (record-accessor struct:parsed-case-lambda 0)))
-(define finish1198
+(define finish_2548
   (make-struct-type-install-properties
    '(parsed-app)
    2
@@ -28549,7 +28561,7 @@
    #f
    2
    0))
-(define effect_2862 (finish1198 struct:parsed-app))
+(define effect_2862 (finish_2548 struct:parsed-app))
 (define parsed-app7.1
   (|#%name|
    parsed-app
@@ -28561,7 +28573,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 finish1200
+(define finish_2663
   (make-struct-type-install-properties
    '(parsed-if)
    3
@@ -28582,7 +28594,7 @@
    #f
    3
    0))
-(define effect_2506 (finish1200 struct:parsed-if))
+(define effect_2506 (finish_2663 struct:parsed-if))
 (define parsed-if8.1
   (|#%name|
    parsed-if
@@ -28595,7 +28607,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 finish1202
+(define finish_3030
   (make-struct-type-install-properties
    '(parsed-set!)
    2
@@ -28616,7 +28628,7 @@
    #f
    2
    0))
-(define effect_2747 (finish1202 struct:parsed-set!))
+(define effect_2747 (finish_3030 struct:parsed-set!))
 (define parsed-set!9.1
   (|#%name|
    parsed-set!
@@ -28628,7 +28640,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 finish1204
+(define finish_2301
   (make-struct-type-install-properties
    '(parsed-with-continuation-mark)
    3
@@ -28649,7 +28661,7 @@
    #f
    3
    0))
-(define effect_2564 (finish1204 struct:parsed-with-continuation-mark))
+(define effect_2564 (finish_2301 struct:parsed-with-continuation-mark))
 (define parsed-with-continuation-mark10.1
   (|#%name|
    parsed-with-continuation-mark
@@ -28674,7 +28686,7 @@
   (|#%name|
    parsed-with-continuation-mark-body
    (record-accessor struct:parsed-with-continuation-mark 2)))
-(define finish1206
+(define finish_2388
   (make-struct-type-install-properties
    '(|parsed-#%variable-reference|)
    1
@@ -28695,7 +28707,7 @@
    #f
    1
    0))
-(define effect_3025 (finish1206 |struct:parsed-#%variable-reference|))
+(define effect_3025 (finish_2388 |struct:parsed-#%variable-reference|))
 (define |parsed-#%variable-reference11.1|
   (|#%name|
    |parsed-#%variable-reference|
@@ -28712,7 +28724,7 @@
   (|#%name|
    |parsed-#%variable-reference-id|
    (record-accessor |struct:parsed-#%variable-reference| 0)))
-(define finish1208
+(define finish_2060
   (make-struct-type-install-properties
    '(parsed-begin)
    1
@@ -28733,7 +28745,7 @@
    #f
    1
    0))
-(define effect_2189 (finish1208 struct:parsed-begin))
+(define effect_2189 (finish_2060 struct:parsed-begin))
 (define parsed-begin12.1
   (|#%name|
    parsed-begin
@@ -28743,7 +28755,7 @@
   (|#%name| parsed-begin? (record-predicate struct:parsed-begin)))
 (define parsed-begin-body
   (|#%name| parsed-begin-body (record-accessor struct:parsed-begin 0)))
-(define finish1210
+(define finish_2061
   (make-struct-type-install-properties
    '(parsed-begin0)
    1
@@ -28764,7 +28776,7 @@
    #f
    1
    0))
-(define effect_2190 (finish1210 struct:parsed-begin0))
+(define effect_2190 (finish_2061 struct:parsed-begin0))
 (define parsed-begin013.1
   (|#%name|
    parsed-begin0
@@ -28774,7 +28786,7 @@
   (|#%name| parsed-begin0? (record-predicate struct:parsed-begin0)))
 (define parsed-begin0-body
   (|#%name| parsed-begin0-body (record-accessor struct:parsed-begin0 0)))
-(define finish1212
+(define finish_2790
   (make-struct-type-install-properties
    '(parsed-quote)
    1
@@ -28795,7 +28807,7 @@
    #f
    1
    0))
-(define effect_2174 (finish1212 struct:parsed-quote))
+(define effect_2174 (finish_2790 struct:parsed-quote))
 (define parsed-quote14.1
   (|#%name|
    parsed-quote
@@ -28805,7 +28817,7 @@
   (|#%name| parsed-quote? (record-predicate struct:parsed-quote)))
 (define parsed-quote-datum
   (|#%name| parsed-quote-datum (record-accessor struct:parsed-quote 0)))
-(define finish1214
+(define finish_2149
   (make-struct-type-install-properties
    '(parsed-quote-syntax)
    1
@@ -28826,7 +28838,7 @@
    #f
    1
    0))
-(define effect_3320 (finish1214 struct:parsed-quote-syntax))
+(define effect_3320 (finish_2149 struct:parsed-quote-syntax))
 (define parsed-quote-syntax15.1
   (|#%name|
    parsed-quote-syntax
@@ -28840,7 +28852,7 @@
   (|#%name|
    parsed-quote-syntax-datum
    (record-accessor struct:parsed-quote-syntax 0)))
-(define finish1216
+(define finish_2373
   (make-struct-type-install-properties
    '(parsed-let_-values)
    3
@@ -28861,7 +28873,7 @@
    #f
    3
    0))
-(define effect_2494 (finish1216 struct:parsed-let_-values))
+(define effect_2494 (finish_2373 struct:parsed-let_-values))
 (define parsed-let_-values16.1
   (|#%name|
    parsed-let_-values
@@ -28881,7 +28893,7 @@
   (|#%name|
    parsed-let_-values-body
    (record-accessor struct:parsed-let_-values 2)))
-(define finish1218
+(define finish_2586
   (make-struct-type-install-properties
    '(parsed-let-values)
    0
@@ -28902,7 +28914,7 @@
    #f
    0
    0))
-(define effect_2429 (finish1218 struct:parsed-let-values))
+(define effect_2429 (finish_2586 struct:parsed-let-values))
 (define parsed-let-values17.1
   (|#%name|
    parsed-let-values
@@ -28910,7 +28922,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 finish1220
+(define finish_2434
   (make-struct-type-install-properties
    '(parsed-letrec-values)
    0
@@ -28931,7 +28943,7 @@
    #f
    0
    0))
-(define effect_2573 (finish1220 struct:parsed-letrec-values))
+(define effect_2573 (finish_2434 struct:parsed-letrec-values))
 (define parsed-letrec-values18.1
   (|#%name|
    parsed-letrec-values
@@ -28941,7 +28953,7 @@
   (|#%name|
    parsed-letrec-values?
    (record-predicate struct:parsed-letrec-values)))
-(define finish1222
+(define finish_2907
   (make-struct-type-install-properties
    '(parsed-define-values)
    3
@@ -28962,7 +28974,7 @@
    #f
    3
    0))
-(define effect_2826 (finish1222 struct:parsed-define-values))
+(define effect_2826 (finish_2907 struct:parsed-define-values))
 (define parsed-define-values19.1
   (|#%name|
    parsed-define-values
@@ -28984,7 +28996,7 @@
   (|#%name|
    parsed-define-values-rhs
    (record-accessor struct:parsed-define-values 2)))
-(define finish1224
+(define finish_3035
   (make-struct-type-install-properties
    '(parsed-define-syntaxes)
    3
@@ -29005,7 +29017,7 @@
    #f
    3
    0))
-(define effect_2530 (finish1224 struct:parsed-define-syntaxes))
+(define effect_2530 (finish_3035 struct:parsed-define-syntaxes))
 (define parsed-define-syntaxes20.1
   (|#%name|
    parsed-define-syntaxes
@@ -29027,7 +29039,7 @@
   (|#%name|
    parsed-define-syntaxes-rhs
    (record-accessor struct:parsed-define-syntaxes 2)))
-(define finish1226
+(define finish_2438
   (make-struct-type-install-properties
    '(parsed-begin-for-syntax)
    1
@@ -29048,7 +29060,7 @@
    #f
    1
    0))
-(define effect_2361 (finish1226 struct:parsed-begin-for-syntax))
+(define effect_2361 (finish_2438 struct:parsed-begin-for-syntax))
 (define parsed-begin-for-syntax21.1
   (|#%name|
    parsed-begin-for-syntax
@@ -29065,7 +29077,7 @@
   (|#%name|
    parsed-begin-for-syntax-body
    (record-accessor struct:parsed-begin-for-syntax 0)))
-(define finish1228
+(define finish_2594
   (make-struct-type-install-properties
    '(|parsed-#%declare|)
    0
@@ -29086,7 +29098,7 @@
    #f
    0
    0))
-(define effect_2603 (finish1228 |struct:parsed-#%declare|))
+(define effect_2603 (finish_2594 |struct:parsed-#%declare|))
 (define |parsed-#%declare22.1|
   (|#%name|
    |parsed-#%declare|
@@ -29094,7 +29106,7 @@
     (make-record-constructor-descriptor |struct:parsed-#%declare| #f #f))))
 (define |parsed-#%declare?|
   (|#%name| |parsed-#%declare?| (record-predicate |struct:parsed-#%declare|)))
-(define finish1230
+(define finish_2046
   (make-struct-type-install-properties
    '(parsed-require)
    0
@@ -29115,7 +29127,7 @@
    #f
    0
    0))
-(define effect_2194 (finish1230 struct:parsed-require))
+(define effect_2194 (finish_2046 struct:parsed-require))
 (define parsed-require23.1
   (|#%name|
    parsed-require
@@ -29123,7 +29135,7 @@
     (make-record-constructor-descriptor struct:parsed-require #f #f))))
 (define parsed-require?
   (|#%name| parsed-require? (record-predicate struct:parsed-require)))
-(define finish1232
+(define finish_3025
   (make-struct-type-install-properties
    '(|parsed-#%module-begin|)
    1
@@ -29144,7 +29156,7 @@
    #f
    1
    0))
-(define effect_2515 (finish1232 |struct:parsed-#%module-begin|))
+(define effect_2515 (finish_3025 |struct:parsed-#%module-begin|))
 (define |parsed-#%module-begin24.1|
   (|#%name|
    |parsed-#%module-begin|
@@ -29161,7 +29173,7 @@
   (|#%name|
    |parsed-#%module-begin-body|
    (record-accessor |struct:parsed-#%module-begin| 0)))
-(define finish1234
+(define finish_2674
   (make-struct-type-install-properties
    '(parsed-module)
    10
@@ -29182,7 +29194,7 @@
    #f
    10
    0))
-(define effect_2433 (finish1234 struct:parsed-module))
+(define effect_2433 (finish_2674 struct:parsed-module))
 (define parsed-module25.1
   (|#%name|
    parsed-module
@@ -29298,7 +29310,7 @@
          (for-loop_0
           (seteq)
           (unsafe-immutable-hash-iterate-first s-scs_0)))))))
-(define finish1239
+(define finish_2378
   (make-struct-type-install-properties
    '(requires+provides)
    9
@@ -29319,7 +29331,7 @@
    #f
    9
    384))
-(define effect_3171 (finish1239 struct:requires+provides))
+(define effect_3171 (finish_2378 struct:requires+provides))
 (define requires+provides1.1
   (|#%name|
    requires+provides
@@ -29371,7 +29383,7 @@
   (|#%name|
    set-requires+provides-all-bindings-simple?!
    (record-mutator struct:requires+provides 8)))
-(define finish1241
+(define finish_2532
   (make-struct-type-install-properties
    '(required)
    4
@@ -29392,7 +29404,7 @@
    #f
    4
    0))
-(define effect_2757 (finish1241 struct:required))
+(define effect_2757 (finish_2532 struct:required))
 (define required2.1
   (|#%name|
    required
@@ -29406,7 +29418,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 finish1243
+(define finish_3058
   (make-struct-type-install-properties
    '(nominal)
    4
@@ -29427,7 +29439,7 @@
    #f
    4
    0))
-(define effect_2287 (finish1243 struct:nominal))
+(define effect_2287 (finish_3058 struct:nominal))
 (define nominal3.1
   (|#%name|
    nominal
@@ -29441,7 +29453,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 finish1245
+(define finish_2664
   (make-struct-type-install-properties
    '(bulk-required)
    5
@@ -29462,7 +29474,7 @@
    #f
    5
    0))
-(define effect_3099 (finish1245 struct:bulk-required))
+(define effect_3099 (finish_2664 struct:bulk-required))
 (define bulk-required4.1
   (|#%name|
    bulk-required
@@ -30890,7 +30902,7 @@
                   (args (raise-binding-result-arity-error 2 args))))
                 table_0))))))
        (for-loop_0 hash2589 (hash-iterate-first provides_0))))))
-(define finish1310
+(define finish_2697
   (make-struct-type-install-properties
    '(adjust-only)
    1
@@ -30911,7 +30923,7 @@
    #f
    1
    0))
-(define effect_2893 (finish1310 struct:adjust-only))
+(define effect_2893 (finish_2697 struct:adjust-only))
 (define adjust-only1.1
   (|#%name|
    adjust-only
@@ -30943,7 +30955,7 @@
          s
          'adjust-only
          'syms))))))
-(define finish1314
+(define finish_2542
   (make-struct-type-install-properties
    '(adjust-prefix)
    1
@@ -30964,7 +30976,7 @@
    #f
    1
    0))
-(define effect_2600 (finish1314 struct:adjust-prefix))
+(define effect_2600 (finish_2542 struct:adjust-prefix))
 (define adjust-prefix2.1
   (|#%name|
    adjust-prefix
@@ -30998,7 +31010,7 @@
          s
          'adjust-prefix
          'sym))))))
-(define finish1318
+(define finish_2348
   (make-struct-type-install-properties
    '(adjust-all-except)
    2
@@ -31019,7 +31031,7 @@
    #f
    2
    0))
-(define effect_2205 (finish1318 struct:adjust-all-except))
+(define effect_2205 (finish_2348 struct:adjust-all-except))
 (define adjust-all-except3.1
   (|#%name|
    adjust-all-except
@@ -31073,7 +31085,7 @@
          s
          'adjust-all-except
          'syms))))))
-(define finish1323
+(define finish_2750
   (make-struct-type-install-properties
    '(adjust-rename)
    2
@@ -31094,7 +31106,7 @@
    #f
    2
    0))
-(define effect_3082 (finish1323 struct:adjust-rename))
+(define effect_3082 (finish_2750 struct:adjust-rename))
 (define adjust-rename4.1
   (|#%name|
    adjust-rename
@@ -33983,7 +33995,7 @@
                 ns_0
                 temp14_1
                 temp15_0)))))))))
-(define finish1369
+(define finish_2527
   (make-struct-type-install-properties
    '(compiled-in-memory)
    13
@@ -34008,7 +34020,7 @@
    #f
    13
    0))
-(define effect_2572 (finish1369 struct:compiled-in-memory))
+(define effect_2572 (finish_2527 struct:compiled-in-memory))
 (define compiled-in-memory1.1
   (|#%name|
    compiled-in-memory
@@ -34325,7 +34337,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 finish1385
+(define finish_2248
   (make-struct-type-install-properties
    '(correlated-linklet)
    3
@@ -34346,7 +34358,7 @@
    #f
    3
    4))
-(define effect_2738 (finish1385 struct:correlated-linklet))
+(define effect_2738 (finish_2248 struct:correlated-linklet))
 (define correlated-linklet1.1
   (|#%name|
    correlated-linklet
@@ -34399,7 +34411,7 @@
        "cannot evaluate unknown linklet: ~s"
        l_0))))
 (define correlated-linklet-vm-bytes #vu8(108 105 110 107 108 101 116))
-(define finish1388
+(define finish_2389
   (make-struct-type-install-properties
    '(faslable-correlated)
    7
@@ -34426,7 +34438,7 @@
    #f
    7
    127))
-(define effect_2370 (finish1388 struct:faslable-correlated))
+(define effect_2370 (finish_2389 struct:faslable-correlated))
 (define faslable-correlated2.1
   (|#%name|
    faslable-correlated
@@ -34572,7 +34584,7 @@
          s
          'faslable-correlated
          'props))))))
-(define finish1398
+(define finish_2803
   (make-struct-type-install-properties
    '(faslable-correlated-linklet)
    2
@@ -34599,7 +34611,7 @@
    #f
    2
    3))
-(define effect_2374 (finish1398 struct:faslable-correlated-linklet))
+(define effect_2374 (finish_2803 struct:faslable-correlated-linklet))
 (define faslable-correlated-linklet3.1
   (|#%name|
    faslable-correlated-linklet
@@ -35325,7 +35337,7 @@
 (define write-int
   (lambda (n_0 port_0)
     (write-bytes (integer->integer-bytes n_0 4 #f #f) port_0)))
-(define finish1444
+(define finish_2634
   (make-struct-type-install-properties
    '(linklet-directory)
    1
@@ -35355,7 +35367,7 @@
    #f
    1
    0))
-(define effect_2692 (finish1444 struct:linklet-directory))
+(define effect_2692 (finish_2634 struct:linklet-directory))
 (define linklet-directory1.1
   (|#%name|
    linklet-directory
@@ -35389,7 +35401,7 @@
          s
          'linklet-directory
          'ht))))))
-(define finish1448
+(define finish_2261
   (make-struct-type-install-properties
    '(linklet-bundle)
    1
@@ -35418,7 +35430,7 @@
    #f
    1
    0))
-(define effect_2464 (finish1448 struct:linklet-bundle))
+(define effect_2464 (finish_2261 struct:linklet-bundle))
 (define linklet-bundle2.1
   (|#%name|
    linklet-bundle
@@ -35616,7 +35628,7 @@
                     (args (raise-binding-result-arity-error 2 args))))
                   result_0))))))
          (for-loop_0 #t (hash-iterate-first ht_0)))))))
-(define finish1452
+(define finish_2892
   (make-struct-type-install-properties
    '(namespace-scopes)
    2
@@ -35637,7 +35649,7 @@
    #f
    2
    3))
-(define effect_2465 (finish1452 struct:namespace-scopes))
+(define effect_2465 (finish_2892 struct:namespace-scopes))
 (define namespace-scopes1.1
   (|#%name|
    namespace-scopes
@@ -35758,7 +35770,7 @@
       (let ((app_0 (namespace-scopes-other nss1_0)))
         (set=? app_0 (namespace-scopes-other nss2_0)))
       #f)))
-(define finish1468
+(define finish_2887
   (make-struct-type-install-properties
    '(syntax-literals)
    2
@@ -35779,7 +35791,7 @@
    #f
    2
    3))
-(define effect_2822 (finish1468 struct:syntax-literals))
+(define effect_2822 (finish_2887 struct:syntax-literals))
 (define syntax-literals1.1
   (|#%name|
    syntax-literals
@@ -35869,7 +35881,7 @@
          v
          'syntax-literals
          'count))))))
-(define finish1475
+(define finish_2543
   (make-struct-type-install-properties
    '(header)
    8
@@ -35890,7 +35902,7 @@
    #f
    8
    36))
-(define effect_2459 (finish1475 struct:header))
+(define effect_2459 (finish_2543 struct:header))
 (define header2.1
   (|#%name|
    header
@@ -36079,7 +36091,7 @@
          v
          'header
          'require-vars-in-order))))))
-(define finish1488
+(define finish_2560
   (make-struct-type-install-properties
    '(variable-use)
    2
@@ -36100,7 +36112,7 @@
    #f
    2
    0))
-(define effect_2838 (finish1488 struct:variable-use))
+(define effect_2838 (finish_2560 struct:variable-use))
 (define variable-use3.1
   (|#%name|
    variable-use
@@ -37682,7 +37694,7 @@
           (if (extra-inspectors-allow? extra-inspectors-1_0 guard-insp_0)
             (extra-inspectors-allow? extra-inspectors-2_0 guard-insp_0)
             #f))))))
-(define finish1649
+(define finish_2356
   (make-struct-type-install-properties
    '(module-use*)
    2
@@ -37703,7 +37715,7 @@
    #f
    2
    3))
-(define effect_2316 (finish1649 struct:module-use*))
+(define effect_2316 (finish_2356 struct:module-use*))
 (define module-use*1.1
   (|#%name|
    module-use*
@@ -38117,7 +38129,7 @@
           (set-module-use*-extra-inspectorss!
            existing-mu*_0
            new-extra-inspectorss_0))))))
-(define finish1659
+(define finish_2980
   (make-struct-type-install-properties
    '(link-info)
    4
@@ -38138,7 +38150,7 @@
    #f
    4
    0))
-(define effect_2792 (finish1659 struct:link-info))
+(define effect_2792 (finish_2980 struct:link-info))
 (define link-info1.1
   (|#%name|
    link-info
@@ -40236,7 +40248,7 @@
                   (let ((app_0 (car cims_1)))
                     (cons app_0 (cdr cims_1)))))))))))
      (loop_0 cims_0))))
-(define finish1726
+(define finish_2519
   (make-struct-type-install-properties
    '(known-defined/delay)
    1
@@ -40257,7 +40269,7 @@
    #f
    1
    1))
-(define effect_2998 (finish1726 struct:known-defined/delay))
+(define effect_2998 (finish_2519 struct:known-defined/delay))
 (define known-defined/delay2.1
   (|#%name|
    known-defined/delay
@@ -40295,7 +40307,7 @@
          s
          'known-defined/delay
          'thunk))))))
-(define finish1730
+(define finish_2590
   (make-struct-type-install-properties
    '(known-property)
    0
@@ -40316,7 +40328,7 @@
    #f
    0
    0))
-(define effect_2476 (finish1730 struct:known-property))
+(define effect_2476 (finish_2590 struct:known-property))
 (define known-property3.1
   (|#%name|
    known-property
@@ -40334,7 +40346,7 @@
         (if (impersonator? v)
           (known-property?_2907 (impersonator-val v))
           #f))))))
-(define finish1733
+(define finish_2139
   (make-struct-type-install-properties
    '(known-property-of-function)
    1
@@ -40361,7 +40373,7 @@
    #f
    1
    1))
-(define effect_2945 (finish1733 struct:known-property-of-function))
+(define effect_2945 (finish_2139 struct:known-property-of-function))
 (define known-property-of-function4.1
   (|#%name|
    known-property-of-function
@@ -40402,7 +40414,7 @@
          s
          'known-property-of-function
          'arity))))))
-(define finish1737
+(define finish_2740
   (make-struct-type-install-properties
    '(known-function)
    2
@@ -40423,7 +40435,7 @@
    #f
    2
    3))
-(define effect_2741 (finish1737 struct:known-function))
+(define effect_2741 (finish_2740 struct:known-function))
 (define known-function5.1
   (|#%name|
    known-function
@@ -40473,7 +40485,7 @@
          s
          'known-function
          'pure?))))))
-(define finish1742
+(define finish_2156
   (make-struct-type-install-properties
    '(known-function-of-satisfying)
    1
@@ -40500,7 +40512,7 @@
    #f
    1
    1))
-(define effect_2265 (finish1742 struct:known-function-of-satisfying))
+(define effect_2265 (finish_2156 struct:known-function-of-satisfying))
 (define known-function-of-satisfying6.1
   (|#%name|
    known-function-of-satisfying
@@ -40541,7 +40553,7 @@
          s
          'known-function-of-satisfying
          'arg-predicate-keys))))))
-(define finish1746
+(define finish_2577
   (make-struct-type-install-properties
    '(known-predicate)
    1
@@ -40562,7 +40574,7 @@
    #f
    1
    1))
-(define effect_2144 (finish1746 struct:known-predicate))
+(define effect_2144 (finish_2577 struct:known-predicate))
 (define known-predicate7.1
   (|#%name|
    known-predicate
@@ -40596,7 +40608,7 @@
          s
          'known-predicate
          'key))))))
-(define finish1750
+(define finish_2469
   (make-struct-type-install-properties
    '(known-satisfies)
    1
@@ -40617,7 +40629,7 @@
    #f
    1
    1))
-(define effect_1976 (finish1750 struct:known-satisfies))
+(define effect_1976 (finish_2469 struct:known-satisfies))
 (define known-satisfies8.1
   (|#%name|
    known-satisfies
@@ -40653,7 +40665,7 @@
          s
          'known-satisfies
          'predicate-key))))))
-(define finish1754
+(define finish_2604
   (make-struct-type-install-properties
    '(known-struct-op)
    2
@@ -40674,7 +40686,7 @@
    #f
    2
    3))
-(define effect_2534 (finish1754 struct:known-struct-op))
+(define effect_2534 (finish_2604 struct:known-struct-op))
 (define known-struct-op9.1
   (|#%name|
    known-struct-op
@@ -45248,7 +45260,7 @@
                                                              ns_0))))))))))))))))))))))))
                (args (raise-binding-result-arity-error 4 args))))
              (if log-performance? (end-performance-region) (void)))))))))
-(define finish1818
+(define finish_2479
   (make-struct-type-install-properties
    '(instance-data)
    2
@@ -45269,7 +45281,7 @@
    #f
    2
    0))
-(define effect_2595 (finish1818 struct:instance-data))
+(define effect_2595 (finish_2479 struct:instance-data))
 (define instance-data9.1
   (|#%name|
    instance-data
@@ -47701,7 +47713,7 @@
                        table_0))))))
               (for-loop_0 hash2610 (hash-iterate-first ht_0))))))
         c_0))))
-(define finish1910
+(define finish_2360
   (make-struct-type-install-properties
    '(recompiled)
    3
@@ -47722,7 +47734,7 @@
    #f
    3
    0))
-(define effect_1973 (finish1910 struct:recompiled))
+(define effect_1973 (finish_2360 struct:recompiled))
 (define recompiled1.1
   (|#%name|
    recompiled
@@ -49249,7 +49261,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 finish1947
+(define finish_2589
   (make-struct-type-install-properties
    '(lift-context)
    3
@@ -49270,7 +49282,7 @@
    #f
    3
    0))
-(define effect_1545 (finish1947 struct:lift-context))
+(define effect_1545 (finish_2589 struct:lift-context))
 (define lift-context1.1
   (|#%name|
    lift-context
@@ -49284,7 +49296,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 finish1949
+(define finish_2698
   (make-struct-type-install-properties
    '(lifted-bind)
    3
@@ -49305,7 +49317,7 @@
    #f
    3
    0))
-(define effect_1767 (finish1949 struct:lifted-bind))
+(define effect_1767 (finish_2698 struct:lifted-bind))
 (define lifted-bind2.1
   (|#%name|
    lifted-bind
@@ -49536,7 +49548,7 @@
                          (for-loop_0 fold-var_2 rest_0)))))
                  fold-var_0))))))
         (for-loop_0 null lifts_0))))))
-(define finish1959
+(define finish_3138
   (make-struct-type-install-properties
    '(module-lift-context)
    3
@@ -49557,7 +49569,7 @@
    #f
    3
    0))
-(define effect_2649 (finish1959 struct:module-lift-context))
+(define effect_2649 (finish_3138 struct:module-lift-context))
 (define module-lift-context15.1
   (|#%name|
    module-lift-context
@@ -49618,7 +49630,7 @@
           (box-cons! (lift-context-lifts module-lifts_0) s_0)
           (error
            "internal error: unrecognized lift-context type for module lift"))))))
-(define finish1961
+(define finish_2859
   (make-struct-type-install-properties
    '(require-lift-context)
    3
@@ -49639,7 +49651,7 @@
    #f
    3
    0))
-(define effect_3057 (finish1961 struct:require-lift-context))
+(define effect_3057 (finish_2859 struct:require-lift-context))
 (define require-lift-context16.1
   (|#%name|
    require-lift-context
@@ -49672,7 +49684,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 finish1963
+(define finish_2755
   (make-struct-type-install-properties
    '(to-module-lift-context)
    4
@@ -49693,7 +49705,7 @@
    #f
    4
    0))
-(define effect_3069 (finish1963 struct:to-module-lift-context))
+(define effect_3069 (finish_2755 struct:to-module-lift-context))
 (define to-module-lift-context17.1
   (|#%name|
    to-module-lift-context
@@ -49742,7 +49754,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 finish1966
+(define finish_2433
   (make-struct-type-install-properties
    '(expanded-syntax)
    2
@@ -49763,7 +49775,7 @@
    #f
    2
    0))
-(define effect_2568 (finish1966 struct:already-expanded))
+(define effect_2568 (finish_2433 struct:already-expanded))
 (define already-expanded1.1
   (|#%name|
    already-expanded
@@ -49820,7 +49832,7 @@
   has-liberal-define-context-property?
   liberal-define-context-value)
  (make-struct-type-property 'liberal-define-context))
-(define finish1971
+(define finish_2095
   (make-struct-type-install-properties
    '(liberal-define-context)
    0
@@ -49841,7 +49853,7 @@
    #f
    0
    0))
-(define effect_2849 (finish1971 struct:liberal-define-context))
+(define effect_2849 (finish_2095 struct:liberal-define-context))
 (define make-liberal-define-context
   (|#%name|
    make-liberal-define-context
@@ -49956,7 +49968,7 @@
                 (wrap_0 '|#%expression|)
                 (fail_0))
               (fail_0))))))))
-(define finish1978
+(define finish_2318
   (make-struct-type-install-properties
    '(reference-record)
    3
@@ -49977,7 +49989,7 @@
    #f
    3
    7))
-(define effect_2371 (finish1978 struct:reference-record))
+(define effect_2371 (finish_2318 struct:reference-record))
 (define reference-record1.1
   (|#%name|
    reference-record
@@ -50122,7 +50134,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 finish1991
+(define finish_2886
   (make-struct-type-install-properties
    '(expanded+parsed)
    2
@@ -50143,7 +50155,7 @@
    #f
    2
    0))
-(define effect_2270 (finish1991 struct:expanded+parsed))
+(define effect_2270 (finish_2886 struct:expanded+parsed))
 (define expanded+parsed1.1
   (|#%name|
    expanded+parsed
@@ -50155,7 +50167,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 finish1993
+(define finish_2856
   (make-struct-type-install-properties
    '(semi-parsed-define-values)
    4
@@ -50176,7 +50188,7 @@
    #f
    4
    0))
-(define effect_2353 (finish1993 struct:semi-parsed-define-values))
+(define effect_2353 (finish_2856 struct:semi-parsed-define-values))
 (define semi-parsed-define-values2.1
   (|#%name|
    semi-parsed-define-values
@@ -50205,7 +50217,7 @@
   (|#%name|
    semi-parsed-define-values-rhs
    (record-accessor struct:semi-parsed-define-values 3)))
-(define finish1995
+(define finish_2970
   (make-struct-type-install-properties
    '(semi-parsed-begin-for-syntax)
    2
@@ -50226,7 +50238,7 @@
    #f
    2
    0))
-(define effect_2815 (finish1995 struct:semi-parsed-begin-for-syntax))
+(define effect_2815 (finish_2970 struct:semi-parsed-begin-for-syntax))
 (define semi-parsed-begin-for-syntax3.1
   (|#%name|
    semi-parsed-begin-for-syntax
@@ -52269,7 +52281,7 @@
      module*
      |#%declare|
      |#%stratified-body|)))
-(define finish2137
+(define finish_2231
   (make-struct-type-install-properties
    '(internal-definition-context)
    5
@@ -52290,7 +52302,7 @@
    #f
    5
    0))
-(define effect_2979 (finish2137 struct:internal-definition-context))
+(define effect_2979 (finish_2231 struct:internal-definition-context))
 (define internal-definition-context1.1
   (|#%name|
    internal-definition-context
@@ -52403,7 +52415,7 @@
          s
          'internal-definition-context
          'parent-ctx))))))
-(define finish2145
+(define finish_2692
   (make-struct-type-install-properties
    '(env-mixin)
    4
@@ -52424,7 +52436,7 @@
    #f
    4
    0))
-(define effect_2352 (finish2145 struct:env-mixin))
+(define effect_2352 (finish_2692 struct:env-mixin))
 (define env-mixin2.1
   (|#%name|
    env-mixin
@@ -57193,7 +57205,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 finish2294
+(define finish_2305
   (make-struct-type-install-properties
    '(lifted-parsed-begin)
    2
@@ -57214,7 +57226,7 @@
    #f
    2
    0))
-(define effect_2583 (finish2294 struct:lifted-parsed-begin))
+(define effect_2583 (finish_2305 struct:lifted-parsed-begin))
 (define lifted-parsed-begin11.1
   (|#%name|
    lifted-parsed-begin
@@ -59463,7 +59475,7 @@
         current-directory
         (find-system-path 'orig-dir)))
      (|#%app| thunk_0))))
-(define finish2331
+(define finish_3090
   (make-struct-type-install-properties
    '(shadow-directory)
    2
@@ -59484,7 +59496,7 @@
    #f
    2
    0))
-(define effect_2776 (finish2331 struct:shadow-directory))
+(define effect_2776 (finish_3090 struct:shadow-directory))
 (define shadow-directory1.1
   (|#%name|
    shadow-directory
@@ -60388,7 +60400,7 @@
           v_0))
        v_0))
    'current-readtable))
-(define finish2361
+(define finish_2405
   (make-struct-type-install-properties
    '(read-config)
    7
@@ -60409,7 +60421,7 @@
    #f
    7
    0))
-(define effect_2490 (finish2361 struct:read-config/outer))
+(define effect_2490 (finish_2405 struct:read-config/outer))
 (define read-config/outer1.1
   (|#%name|
    read-config/outer
@@ -60435,7 +60447,7 @@
   (|#%name|
    read-config-keep-comment?
    (record-accessor struct:read-config/outer 6)))
-(define finish2363
+(define finish_2733
   (make-struct-type-install-properties
    '(read-config/inner)
    13
@@ -60456,7 +60468,7 @@
    #f
    13
    0))
-(define effect_2436 (finish2363 struct:read-config/inner))
+(define effect_2436 (finish_2733 struct:read-config/inner))
 (define read-config/inner2.1
   (|#%name|
    read-config/inner
@@ -60599,7 +60611,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 finish2366
+(define finish_2658
   (make-struct-type-install-properties
    '(read-config-state)
    2
@@ -60620,7 +60632,7 @@
    #f
    2
    3))
-(define effect_2073 (finish2366 struct:read-config-state))
+(define effect_2073 (finish_2658 struct:read-config-state))
 (define read-config-state3.1
   (|#%name|
    read-config-state
@@ -61151,7 +61163,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 finish2410
+(define finish_2605
   (make-struct-type-install-properties
    '(special-comment)
    1
@@ -61172,7 +61184,7 @@
    #f
    1
    0))
-(define effect_3106 (finish2410 struct:special-comment))
+(define effect_3106 (finish_2605 struct:special-comment))
 (define 1/make-special-comment
   (|#%name|
    make-special-comment
@@ -61182,7 +61194,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 finish2412
+(define finish_2508
   (make-struct-type-install-properties
    '(readtable)
    4
@@ -61203,7 +61215,7 @@
    #f
    4
    0))
-(define effect_2167 (finish2412 struct:readtable))
+(define effect_2167 (finish_2508 struct:readtable))
 (define readtable1.1
   (|#%name|
    readtable
@@ -61566,7 +61578,7 @@
                         (args (raise-binding-result-arity-error 2 args))))
                       fold-var_0))))))
              (for-loop_0 null (hash-iterate-first ht_0))))))))))
-(define finish2426
+(define finish_2954
   (make-struct-type-install-properties
    '(special)
    1
@@ -61587,7 +61599,7 @@
    #f
    1
    0))
-(define effect_2677 (finish2426 struct:special))
+(define effect_2677 (finish_2954 struct:special))
 (define special1.1
   (|#%name|
    special
@@ -62116,7 +62128,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 finish2458
+(define finish_2485
   (make-struct-type-install-properties
    '(accum-string)
    2
@@ -62137,7 +62149,7 @@
    #f
    2
    3))
-(define effect_2784 (finish2458 struct:accum-string))
+(define effect_2784 (finish_2485 struct:accum-string))
 (define accum-string1.1
   (|#%name|
    accum-string
@@ -62240,7 +62252,7 @@
     (set-read-config-state-accum-str!
      (begin-unsafe (read-config/inner-st (read-config/outer-inner config_0)))
      a_0)))
-(define finish2472
+(define finish_2880
   (make-struct-type-install-properties
    '(indentation)
    8
@@ -62261,7 +62273,7 @@
    #f
    8
    246))
-(define effect_2185 (finish2472 struct:indentation))
+(define effect_2185 (finish_2880 struct:indentation))
 (define indentation1.1
   (|#%name|
    indentation
@@ -63275,7 +63287,7 @@
        decimal-mode_0
        convert-mode_0
        single-mode_0))))
-(define finish2521
+(define finish_2818
   (make-struct-type-install-properties
    '(parse-state)
    5
@@ -63296,7 +63308,7 @@
    #f
    5
    0))
-(define effect_2177 (finish2521 struct:parse-state))
+(define effect_2177 (finish_2818 struct:parse-state))
 (define parse-state6.1
   (|#%name|
    parse-state
@@ -63316,7 +63328,7 @@
   (|#%name|
    parse-state-other-exactness
    (record-accessor struct:parse-state 4)))
-(define finish2523
+(define finish_2141
   (make-struct-type-install-properties
    '(rect-prefix)
    3
@@ -63337,7 +63349,7 @@
    #f
    3
    0))
-(define effect_2477 (finish2523 struct:rect-prefix))
+(define effect_2477 (finish_2141 struct:rect-prefix))
 (define rect-prefix7.1
   (|#%name|
    rect-prefix
@@ -63351,7 +63363,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 finish2525
+(define finish_3094
   (make-struct-type-install-properties
    '(polar-prefix)
    3
@@ -63372,7 +63384,7 @@
    #f
    3
    0))
-(define effect_2366 (finish2525 struct:polar-prefix))
+(define effect_2366 (finish_3094 struct:polar-prefix))
 (define polar-prefix8.1
   (|#%name|
    polar-prefix
@@ -63474,7 +63486,7 @@
     (if (eq? (state->convert-mode state_0) 'must-read)
       (format "cannot combine extflonum `~a` into a complex number" i_0)
       #f)))
-(define finish2535
+(define finish_3231
   (make-struct-type-install-properties
    '(lazy-expt)
    3
@@ -63495,7 +63507,7 @@
    #f
    3
    0))
-(define effect_2131 (finish2535 struct:lazy-expt))
+(define effect_2131 (finish_3231 struct:lazy-expt))
 (define lazy-expt9.1
   (|#%name|
    lazy-expt
@@ -63508,7 +63520,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 finish2537
+(define finish_2687
   (make-struct-type-install-properties
    '(lazy-rational)
    2
@@ -63529,7 +63541,7 @@
    #f
    2
    0))
-(define effect_3104 (finish2537 struct:lazy-rational))
+(define effect_3104 (finish_2687 struct:lazy-rational))
 (define lazy-rational10.1
   (|#%name|
    lazy-rational
@@ -72680,7 +72692,7 @@
       maybe-insp_0
       (let ((or-part_0 (current-module-code-inspector)))
         (if or-part_0 or-part_0 (current-code-inspector))))))
-(define finish2882
+(define finish_2681
   (make-struct-type-install-properties
    '(serialized-syntax)
    5
@@ -72701,7 +72713,7 @@
    #f
    5
    31))
-(define effect_2423 (finish2882 struct:serialized-syntax))
+(define effect_2423 (finish_2681 struct:serialized-syntax))
 (define serialized-syntax1.1
   (|#%name|
    serialized-syntax
diff --git a/racket/src/cs/schemified/io.scm b/racket/src/cs/schemified/io.scm
index 6b3415a69b..7382a1621c 100644
--- a/racket/src/cs/schemified/io.scm
+++ b/racket/src/cs/schemified/io.scm
@@ -2018,13 +2018,13 @@
         (let ((app_1 (|#%app| range-ref v_0 0)))
           (values values #f app_0 app_1 (|#%app| range-ref v_0 2) #f #f))))))))
 (define check-range
-  (lambda (a_0 b_0 step_0)
+  (lambda (a_0 b_0 step_0) (check-range-generic 'in-range a_0 b_0 step_0)))
+(define check-range-generic
+  (lambda (who_0 a_0 b_0 step_0)
     (begin
-      (if (real? a_0) (void) (raise-argument-error 'in-range "real?" a_0))
-      (if (real? b_0) (void) (raise-argument-error 'in-range "real?" b_0))
-      (if (real? step_0)
-        (void)
-        (raise-argument-error 'in-range "real?" step_0)))))
+      (if (real? a_0) (void) (raise-argument-error who_0 "real?" a_0))
+      (if (real? b_0) (void) (raise-argument-error who_0 "real?" b_0))
+      (if (real? step_0) (void) (raise-argument-error who_0 "real?" step_0)))))
 (define check-naturals
   (lambda (n_0)
     (if (if (integer? n_0) (if (exact? n_0) (>= n_0 0) #f) #f)
@@ -2490,6 +2490,18 @@
                     (cons app_0 (loop_0 (cdr list_1)))))))))))
        (loop_0 list_0)))))
 (define remq (lambda (item_0 list_0) (do-remove 'remq item_0 list_0 eq?)))
+(define print-value-columns
+  (make-parameter
+   +inf.0
+   (lambda (c_0)
+     (if (let ((or-part_0 (eqv? c_0 +inf.0)))
+           (if or-part_0 or-part_0 (if (exact-integer? c_0) (> c_0 5) #f)))
+       c_0
+       (raise-argument-error
+        'print-value-columns
+        "(or/c +inf.0 (and/c exact-integer? (>/c 5)))"
+        c_0)))
+   'print-value-columns))
 (define internal-error
   (lambda (msg_0)
     (raise
@@ -2508,7 +2520,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 finish57
+(define finish_1970
   (make-struct-type-install-properties
    '(sandman)
    11
@@ -2535,7 +2547,7 @@
    #f
    11
    2047))
-(define effect_2951 (finish57 struct:sandman))
+(define effect_2951 (finish_1970 struct:sandman))
 (define sandman1.1
   (|#%name|
    sandman
@@ -2966,6 +2978,8 @@
   (begin-unsafe (hash-ref rktio-table 'rktio_read_converted)))
 (define rktio_read_in (begin-unsafe (hash-ref rktio-table 'rktio_read_in)))
 (define rktio_write_in (begin-unsafe (hash-ref rktio-table 'rktio_write_in)))
+(define rktio_read_converted_in
+  (begin-unsafe (hash-ref rktio-table 'rktio_read_converted_in)))
 (define rktio_buffered_byte_count
   (begin-unsafe (hash-ref rktio-table 'rktio_buffered_byte_count)))
 (define rktio_poll_read_ready
@@ -3484,7 +3498,7 @@
                         (|#%app| rktio_free h_0)
                         (loop_0 #t))))))))))
          (loop_0 #f))))))
-(define finish313
+(define finish_2882
   (make-struct-type-install-properties
    '(exts)
    2
@@ -3505,7 +3519,7 @@
    #f
    2
    0))
-(define effect_2505 (finish313 struct:exts))
+(define effect_2505 (finish_2882 struct:exts))
 (define exts1.1
   (|#%name|
    exts
@@ -3777,7 +3791,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 finish328
+(define finish_2455
   (make-struct-type-install-properties
    '(core-port)
    7
@@ -3802,7 +3816,7 @@
    #f
    7
    124))
-(define effect_2337 (finish328 struct:core-port))
+(define effect_2337 (finish_2455 struct:core-port))
 (define create-core-port
   (|#%name|
    create-core-port
@@ -3833,7 +3847,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 finish331
+(define finish_2057
   (make-struct-type-install-properties
    '(core-port-methods)
    5
@@ -3854,7 +3868,7 @@
    #f
    5
    0))
-(define effect_2309 (finish331 struct:core-port-methods.1))
+(define effect_2309 (finish_2057 struct:core-port-methods.1))
 (define core-port-methods1.1
   (|#%name|
    core-port-methods
@@ -3969,7 +3983,7 @@
    #f
    #f
    #f))
-(define finish338
+(define finish_2711
   (make-struct-type-install-properties
    '(direct)
    3
@@ -3990,7 +4004,7 @@
    #f
    3
    7))
-(define effect_2682 (finish338 struct:direct))
+(define effect_2682 (finish_2711 struct:direct))
 (define direct2.1
   (|#%name|
    direct
@@ -4006,7 +4020,7 @@
   (|#%name| set-direct-pos! (record-mutator struct:direct 1)))
 (define set-direct-end!
   (|#%name| set-direct-end! (record-mutator struct:direct 2)))
-(define finish340
+(define finish_2554
   (make-struct-type-install-properties
    '(location)
    5
@@ -4027,7 +4041,7 @@
    #f
    5
    31))
-(define effect_3131 (finish340 struct:location))
+(define effect_3131 (finish_2554 struct:location))
 (define location3.1
   (|#%name|
    location
@@ -4113,7 +4127,7 @@
                (if who3_0
                  (raise-argument-error who3_0 "input-port?" v4_0)
                  default_0)))))))))
-(define finish342
+(define finish_2969
   (make-struct-type-install-properties
    '(core-input-port)
    2
@@ -4164,7 +4178,7 @@
    #f
    2
    3))
-(define effect_2528 (finish342 struct:core-input-port))
+(define effect_2528 (finish_2969 struct:core-input-port))
 (define create-core-input-port
   (|#%name|
    create-core-input-port
@@ -4188,7 +4202,7 @@
   (|#%name|
    set-core-input-port-read-handler!
    (record-mutator struct:core-input-port 1)))
-(define finish345
+(define finish_2853
   (make-struct-type-install-properties
    '(core-input-port-methods)
    6
@@ -4209,7 +4223,7 @@
    #f
    6
    0))
-(define effect_2085 (finish345 struct:core-input-port-methods.1))
+(define effect_2085 (finish_2853 struct:core-input-port-methods.1))
 (define core-input-port-methods6.1
   (|#%name|
    core-input-port-methods
@@ -4432,7 +4446,7 @@
                (if who3_0
                  (raise-argument-error who3_0 "output-port?" v4_0)
                  default_0)))))))))
-(define finish357
+(define finish_2574
   (make-struct-type-install-properties
    '(core-output-port)
    4
@@ -4470,7 +4484,7 @@
    #f
    4
    15))
-(define effect_2808 (finish357 struct:core-output-port))
+(define effect_2808 (finish_2574 struct:core-output-port))
 (define create-core-output-port
   (|#%name|
    create-core-output-port
@@ -4508,7 +4522,7 @@
   (|#%name|
    set-core-output-port-display-handler!
    (record-mutator struct:core-output-port 3)))
-(define finish361
+(define finish_2648
   (make-struct-type-install-properties
    '(core-output-port-methods)
    4
@@ -4529,7 +4543,7 @@
    #f
    4
    0))
-(define effect_2050 (finish361 struct:core-output-port-methods.1))
+(define effect_2050 (finish_2648 struct:core-output-port-methods.1))
 (define core-output-port-methods6.1
   (|#%name|
    core-output-port-methods
@@ -4679,7 +4693,7 @@
              (if (evt? v_0)
                (values #f (replace-evt v_0 self-evt_0))
                (values (list v_0) #f)))))))))
-(define finish372
+(define finish_2671
   (make-struct-type-install-properties
    '(write-evt)
    1
@@ -4706,7 +4720,7 @@
    #f
    1
    0))
-(define effect_2493 (finish372 struct:write-evt))
+(define effect_2493 (finish_2671 struct:write-evt))
 (define write-evt7.1
   (|#%name|
    write-evt
@@ -4751,7 +4765,7 @@
    #f
    #f
    #f))
-(define finish376
+(define finish_2110
   (make-struct-type-install-properties
    '(utf-8-state)
    3
@@ -4772,7 +4786,7 @@
    #f
    3
    0))
-(define effect_2751 (finish376 struct:utf-8-state))
+(define effect_2751 (finish_2110 struct:utf-8-state))
 (define utf-8-state1.1
   (|#%name|
    utf-8-state
@@ -6578,7 +6592,7 @@
         (if old-offset_0
           (set-core-port-offset! in_0 (+ amt_0 old-offset_0))
           (void))))))
-(define finish456
+(define finish_2616
   (make-struct-type-install-properties
    '(commit-manager)
    3
@@ -6599,7 +6613,7 @@
    #f
    3
    0))
-(define effect_2594 (finish456 struct:commit-manager))
+(define effect_2594 (finish_2616 struct:commit-manager))
 (define commit-manager1.1
   (|#%name|
    commit-manager
@@ -6669,7 +6683,7 @@
          s
          'commit-manager
          'thread))))))
-(define finish462
+(define finish_2581
   (make-struct-type-install-properties
    '(commit-request)
    5
@@ -6690,7 +6704,7 @@
    #f
    5
    0))
-(define effect_2646 (finish462 struct:commit-request))
+(define effect_2646 (finish_2581 struct:commit-request))
 (define commit-request2.1
   (|#%name|
    commit-request
@@ -6794,7 +6808,7 @@
          s
          'commit-request
          'result-ch))))))
-(define finish470
+(define finish_2113
   (make-struct-type-install-properties
    '(commit-response)
    2
@@ -6815,7 +6829,7 @@
    #f
    2
    0))
-(define effect_2529 (finish470 struct:commit-response))
+(define effect_2529 (finish_2113 struct:commit-response))
 (define commit-response3.1
   (|#%name|
    commit-response
@@ -7112,7 +7126,7 @@
                  (sync result-ch_0))
                (unsafe-start-atomic))))
          (lambda () (semaphore-post abandon-evt_0)))))))
-(define finish489
+(define finish_3101
   (make-struct-type-install-properties
    '(commit-input-port)
    2
@@ -7133,7 +7147,7 @@
    #f
    2
    3))
-(define effect_2802 (finish489 struct:commit-input-port))
+(define effect_2802 (finish_3101 struct:commit-input-port))
 (define create-commit-input-port
   (|#%name|
    create-commit-input-port
@@ -7157,7 +7171,7 @@
   (|#%name|
    set-commit-input-port-commit-manager!
    (record-mutator struct:commit-input-port 1)))
-(define finish492
+(define finish_2744
   (make-struct-type-install-properties
    '(commit-input-port-methods)
    0
@@ -7178,7 +7192,7 @@
    #f
    0
    0))
-(define effect_3199 (finish492 struct:commit-input-port-methods.1))
+(define effect_3199 (finish_2744 struct:commit-input-port-methods.1))
 (define commit-input-port-methods5.1
   (|#%name|
    commit-input-port-methods
@@ -7332,7 +7346,7 @@
            (begin0
              (begin (temp3.1$3 d_0) (temp4.1$2 d_0))
              (unsafe-end-atomic))))))))
-(define finish504
+(define finish_2207
   (make-struct-type-install-properties
    '(pipe-data)
    16
@@ -7353,7 +7367,7 @@
    #f
    16
    65534))
-(define effect_3021 (finish504 struct:pipe-data))
+(define effect_3021 (finish_2207 struct:pipe-data))
 (define create-pipe-data
   (|#%name|
    create-pipe-data
@@ -7434,7 +7448,7 @@
   (|#%name|
    set-pipe-data-write-ready-evt!
    (record-mutator struct:pipe-data 15)))
-(define finish507
+(define finish_2129
   (make-struct-type-install-properties
    '(pipe-data-methods)
    0
@@ -7455,7 +7469,7 @@
    #f
    0
    0))
-(define effect_2537 (finish507 struct:pipe-data-methods.1))
+(define effect_2537 (finish_2129 struct:pipe-data-methods.1))
 (define pipe-data-methods10.1
   (|#%name|
    pipe-data-methods
@@ -7568,7 +7582,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 finish511
+(define finish_3163
   (make-struct-type-install-properties
    '(pipe-input-port)
    1
@@ -7589,7 +7603,7 @@
    #f
    1
    1))
-(define effect_2318 (finish511 struct:pipe-input-port))
+(define effect_2318 (finish_3163 struct:pipe-input-port))
 (define create-pipe-input-port
   (|#%name|
    create-pipe-input-port
@@ -7601,7 +7615,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 finish514
+(define finish_2415
   (make-struct-type-install-properties
    '(pipe-input-port-methods)
    0
@@ -7622,7 +7636,7 @@
    #f
    0
    0))
-(define effect_2335 (finish514 struct:pipe-input-port-methods.1))
+(define effect_2335 (finish_2415 struct:pipe-input-port-methods.1))
 (define pipe-input-port-methods15.1
   (|#%name|
    pipe-input-port-methods
@@ -7964,7 +7978,7 @@
                      (set-direct-pos! b_0 (direct-end b_0)))))
                (void))
              (temp2.1$2 o_0))))))))
-(define finish533
+(define finish_2124
   (make-struct-type-install-properties
    '(pipe-output-port)
    1
@@ -7985,7 +7999,7 @@
    #f
    1
    1))
-(define effect_2635 (finish533 struct:pipe-output-port))
+(define effect_2635 (finish_2124 struct:pipe-output-port))
 (define create-pipe-output-port
   (|#%name|
    create-pipe-output-port
@@ -7999,7 +8013,7 @@
   (|#%name|
    set-pipe-output-port-d!
    (record-mutator struct:pipe-output-port 0)))
-(define finish536
+(define finish_2185
   (make-struct-type-install-properties
    '(pipe-output-port-methods)
    0
@@ -8020,7 +8034,7 @@
    #f
    0
    0))
-(define effect_3193 (finish536 struct:pipe-output-port-methods.1))
+(define effect_3193 (finish_2185 struct:pipe-output-port-methods.1))
 (define pipe-output-port-methods20.1
   (|#%name|
    pipe-output-port-methods
@@ -8576,7 +8590,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 finish572
+(define finish_2922
   (make-struct-type-install-properties
    '(pipe-write-poller)
    1
@@ -8627,7 +8641,7 @@
    #f
    1
    0))
-(define effect_2599 (finish572 struct:pipe-write-poller))
+(define effect_2599 (finish_2922 struct:pipe-write-poller))
 (define pipe-write-poller27.1
   (|#%name|
    pipe-write-poller
@@ -8661,7 +8675,7 @@
          s
          'pipe-write-poller
          'd))))))
-(define finish577
+(define finish_2669
   (make-struct-type-install-properties
    '(pipe-read-poller)
    1
@@ -8712,7 +8726,7 @@
    #f
    1
    0))
-(define effect_2907 (finish577 struct:pipe-read-poller))
+(define effect_2907 (finish_2669 struct:pipe-read-poller))
 (define pipe-read-poller28.1
   (|#%name|
    pipe-read-poller
@@ -8746,7 +8760,7 @@
          s
          'pipe-read-poller
          'd))))))
-(define finish581
+(define finish_2316
   (make-struct-type-install-properties
    '(peek-via-read-input-port)
    5
@@ -8767,7 +8781,7 @@
    #f
    5
    31))
-(define effect_2578 (finish581 struct:peek-via-read-input-port))
+(define effect_2578 (finish_2316 struct:peek-via-read-input-port))
 (define create-peek-via-read-input-port
   (|#%name|
    create-peek-via-read-input-port
@@ -8820,7 +8834,7 @@
   (|#%name|
    set-peek-via-read-input-port-buffer-mode!
    (record-mutator struct:peek-via-read-input-port 4)))
-(define finish584
+(define finish_3197
   (make-struct-type-install-properties
    '(peek-via-read-input-port-methods)
    1
@@ -8841,7 +8855,7 @@
    #f
    1
    0))
-(define effect_2499 (finish584 struct:peek-via-read-input-port-methods.1))
+(define effect_2499 (finish_3197 struct:peek-via-read-input-port-methods.1))
 (define peek-via-read-input-port-methods10.1
   (|#%name|
    peek-via-read-input-port-methods
@@ -8980,7 +8994,8 @@
                                     dest-bstr131_0
                                     start132_0
                                     end133_0
-                                    copy?134_0)))
+                                    copy?134_0
+                                    #f)))
                               (begin
                                 (if (eqv? v_0 0) (void) (temp1.1 this-id_0))
                                 v_0))))))))))
@@ -9140,7 +9155,12 @@
                          (|#%app| finish272_0 dest-bstr_0)))))))))))
        (|#%name|
         read-in/inner
-        (lambda (this-id_0 dest-bstr306_0 start307_0 end308_0 copy?309_0)
+        (lambda (this-id_0
+                 dest-bstr306_0
+                 start307_0
+                 end308_0
+                 copy?309_0
+                 to-buffer?310_0)
           (begin 0)))))))
 (define temp6.1$1
   (|#%name|
@@ -9164,70 +9184,94 @@
 (define temp8.1
   (|#%name|
    buffer-adjust-pos
-   (lambda (this-id_0 i401_0)
+   (lambda (this-id_0 i403_0 is-converted404_0)
      (begin
        (let ((b_0 (core-port-buffer this-id_0)))
-         (-
-          i401_0
-          (let ((app_0 (peek-via-read-input-port-end-pos this-id_0)))
-            (fx-
-             app_0
-             (if (direct-bstr b_0)
-               (direct-pos b_0)
-               (peek-via-read-input-port-pos this-id_0))))))))))
+         (let ((start-pos_0
+                (if (direct-bstr b_0)
+                  (direct-pos b_0)
+                  (peek-via-read-input-port-pos this-id_0))))
+           (let ((r_0
+                  (-
+                   i403_0
+                   (fx-
+                    (peek-via-read-input-port-end-pos this-id_0)
+                    start-pos_0))))
+             (if is-converted404_0
+               (letrec*
+                ((loop_0
+                  (|#%name|
+                   loop
+                   (lambda (pos_0 r_1)
+                     (begin
+                       (if (fx=
+                            pos_0
+                            (peek-via-read-input-port-end-pos this-id_0))
+                         r_1
+                         (let ((app_0 (fx+ pos_0 1)))
+                           (loop_0
+                            app_0
+                            (if (eqv?
+                                 0
+                                 (unsafe-bytes-ref is-converted404_0 pos_0))
+                              r_1
+                              (- r_1 1))))))))))
+                (loop_0 start-pos_0 r_0))
+               r_0))))))))
 (define temp9.1
   (|#%name|
    default-buffer-mode
    (case-lambda
     ((this-id_0) (begin (peek-via-read-input-port-buffer-mode this-id_0)))
-    ((this-id_0 mode432_0)
-     (set-peek-via-read-input-port-buffer-mode! this-id_0 mode432_0)))))
+    ((this-id_0 mode436_0)
+     (set-peek-via-read-input-port-buffer-mode! this-id_0 mode436_0)))))
 (define temp1.1$1
   (let ((pull-some-bytes_0
          (|#%name|
           pull-some-bytes
-          (lambda (this-id498_0 amt492495_0 offset493496_0 init-pos494497_0)
+          (lambda (this-id502_0 amt496499_0 offset497500_0 init-pos498501_0)
             (begin
-              (let ((amt492_0
-                     (if (eq? amt492495_0 unsafe-undefined)
+              (let ((amt496_0
+                     (if (eq? amt496499_0 unsafe-undefined)
                        (if (eq?
                             'block
                             (peek-via-read-input-port-buffer-mode
-                             this-id498_0))
+                             this-id502_0))
                          (unsafe-bytes-length
-                          (peek-via-read-input-port-bstr this-id498_0))
+                          (peek-via-read-input-port-bstr this-id502_0))
                          1)
-                       amt492495_0)))
-                (let ((offset493_0
-                       (if (eq? offset493496_0 unsafe-undefined)
+                       amt496499_0)))
+                (let ((offset497_0
+                       (if (eq? offset497500_0 unsafe-undefined)
                          0
-                         offset493496_0)))
-                  (let ((init-pos494_0
-                         (if (eq? init-pos494497_0 unsafe-undefined)
+                         offset497500_0)))
+                  (let ((init-pos498_0
+                         (if (eq? init-pos498501_0 unsafe-undefined)
                            0
-                           init-pos494497_0)))
+                           init-pos498501_0)))
                     (let ((get-end_0
-                           (let ((app_0 (+ amt492_0 offset493_0)))
+                           (let ((app_0 (+ amt496_0 offset497_0)))
                              (min
                               app_0
                               (unsafe-bytes-length
                                (peek-via-read-input-port-bstr
-                                this-id498_0))))))
+                                this-id502_0))))))
                       (let ((v_0
                              (let ((app_0
                                     (peek-via-read-input-port-methods-read-in/inner.1
-                                     (core-port-vtable this-id498_0))))
+                                     (core-port-vtable this-id502_0))))
                                (|#%app|
                                 app_0
-                                this-id498_0
-                                (peek-via-read-input-port-bstr this-id498_0)
-                                offset493_0
+                                this-id502_0
+                                (peek-via-read-input-port-bstr this-id502_0)
+                                offset497_0
                                 get-end_0
-                                #f))))
+                                #f
+                                #t))))
                         (if (eof-object? v_0)
                           (begin
                             (set-peek-via-read-input-port-peeked-eof?!
-                             this-id498_0
+                             this-id502_0
                              #t)
                             eof)
                           (if (evt? v_0)
@@ -9236,11 +9280,11 @@
                               0
                               (begin
                                 (set-peek-via-read-input-port-pos!
-                                 this-id498_0
-                                 init-pos494_0)
+                                 this-id502_0
+                                 init-pos498_0)
                                 (set-peek-via-read-input-port-end-pos!
-                                 this-id498_0
-                                 (fx+ offset493_0 v_0))
+                                 this-id502_0
+                                 (fx+ offset497_0 v_0))
                                 v_0))))))))))))))
     (|#%name|
      pull-some-bytes
@@ -9252,20 +9296,20 @@
           unsafe-undefined
           unsafe-undefined
           unsafe-undefined)))
-      ((this-id_0 amt492_0 offset493_0 init-pos494497_0)
-       (pull-some-bytes_0 this-id_0 amt492_0 offset493_0 init-pos494497_0))
-      ((this-id_0 amt492_0 offset493496_0)
-       (pull-some-bytes_0 this-id_0 amt492_0 offset493496_0 unsafe-undefined))
-      ((this-id_0 amt492495_0)
+      ((this-id_0 amt496_0 offset497_0 init-pos498501_0)
+       (pull-some-bytes_0 this-id_0 amt496_0 offset497_0 init-pos498501_0))
+      ((this-id_0 amt496_0 offset497500_0)
+       (pull-some-bytes_0 this-id_0 amt496_0 offset497500_0 unsafe-undefined))
+      ((this-id_0 amt496499_0)
        (pull-some-bytes_0
         this-id_0
-        amt492495_0
+        amt496499_0
         unsafe-undefined
         unsafe-undefined))))))
 (define temp2.1$1
   (|#%name|
    pull-more-bytes
-   (lambda (this-id_0 amt621_0)
+   (lambda (this-id_0 amt625_0)
      (begin
        (if (let ((app_0 (peek-via-read-input-port-end-pos this-id_0)))
              (fx<
@@ -9279,7 +9323,7 @@
                          (unsafe-bytes-length
                           (peek-via-read-input-port-bstr this-id_0))))
                     (fx- app_0 (peek-via-read-input-port-end-pos this-id_0)))
-                  amt621_0)))
+                  amt625_0)))
            (let ((app_0 temp1.1$1))
              (let ((app_1 (peek-via-read-input-port-end-pos this-id_0)))
                (|#%app|
@@ -9308,7 +9352,7 @@
                  (|#%app|
                   app_0
                   this-id_0
-                  amt621_0
+                  amt625_0
                   (peek-via-read-input-port-end-pos this-id_0)))))
            (begin
              (let ((app_0 (peek-via-read-input-port-bstr this-id_0)))
@@ -9325,16 +9369,16 @@
               (let ((app_0 (peek-via-read-input-port-end-pos this-id_0)))
                 (fx- app_0 (peek-via-read-input-port-pos this-id_0))))
              (set-peek-via-read-input-port-pos! this-id_0 0)
-             (temp2.1$1 this-id_0 amt621_0))))))))
+             (temp2.1$1 this-id_0 amt625_0))))))))
 (define temp3.1$2
   (|#%name|
    retry-pull?
-   (lambda (this-id_0 v652_0)
-     (begin (if (integer? v652_0) (not (eqv? v652_0 0)) #f)))))
+   (lambda (this-id_0 v656_0)
+     (begin (if (integer? v656_0) (not (eqv? v656_0 0)) #f)))))
 (define temp4.1$1
   (|#%name|
    fast-mode!
-   (lambda (this-id_0 amt683_0)
+   (lambda (this-id_0 amt687_0)
      (begin
        (let ((b_0 (core-port-buffer this-id_0)))
          (begin
@@ -9348,7 +9392,7 @@
                   (peek-via-read-input-port-end-pos this-id_0))
                  (let ((o_0 (core-port-offset this-id_0)))
                    (if o_0
-                     (set-core-port-offset! this-id_0 (- (+ o_0 amt683_0) s_0))
+                     (set-core-port-offset! this-id_0 (- (+ o_0 amt687_0) s_0))
                      (void))))))))))))
 (define temp5.1$1
   (|#%name|
@@ -9526,10 +9570,10 @@
                           (current-continuation-marks)))))))
                  (void))))
            (void)))))))
-(define finish620
+(define finish_2872
   (make-struct-type-install-properties
    '(fd-input-port)
-   3
+   4
    0
    struct:peek-via-read-input-port
    (list
@@ -9550,9 +9594,9 @@
    (|#%nongenerative-uid| fd-input-port)
    #f
    #f
-   3
-   7))
-(define effect_1979 (finish620 struct:fd-input-port))
+   4
+   15))
+(define effect_1979 (finish_2872 struct:fd-input-port))
 (define create-fd-input-port
   (|#%name|
    create-fd-input-port
@@ -9570,6 +9614,10 @@
   (|#%name|
    fd-input-port-custodian-reference
    (record-accessor struct:fd-input-port 2)))
+(define fd-input-port-is-converted
+  (|#%name|
+   fd-input-port-is-converted
+   (record-accessor struct:fd-input-port 3)))
 (define set-fd-input-port-fd!
   (|#%name| set-fd-input-port-fd! (record-mutator struct:fd-input-port 0)))
 (define set-fd-input-port-fd-refcount!
@@ -9580,7 +9628,11 @@
   (|#%name|
    set-fd-input-port-custodian-reference!
    (record-mutator struct:fd-input-port 2)))
-(define finish623
+(define set-fd-input-port-is-converted!
+  (|#%name|
+   set-fd-input-port-is-converted!
+   (record-mutator struct:fd-input-port 3)))
+(define finish_2012
   (make-struct-type-install-properties
    '(fd-input-port-methods)
    2
@@ -9601,7 +9653,7 @@
    #f
    2
    0))
-(define effect_2420 (finish623 struct:fd-input-port-methods.1))
+(define effect_2420 (finish_2012 struct:fd-input-port-methods.1))
 (define fd-input-port-methods6.1
   (|#%name|
    fd-input-port-methods
@@ -9694,11 +9746,11 @@
                            (fd-input-port-methods-on-close.1
                             (core-port-vtable this-id_0))
                            this-id_0)
-                          (let ((fd75_0 (fd-input-port-fd this-id_0)))
-                            (let ((fd-refcount76_0
+                          (let ((fd76_0 (fd-input-port-fd this-id_0)))
+                            (let ((fd-refcount77_0
                                    (fd-input-port-fd-refcount this-id_0)))
-                              (let ((fd75_1 fd75_0))
-                                (fd-close.1 #f fd75_1 fd-refcount76_0))))
+                              (let ((fd76_1 fd76_0))
+                                (fd-close.1 #f fd76_1 fd-refcount77_0))))
                           (|#%app|
                            1/unsafe-custodian-unregister
                            this-id_0
@@ -9716,15 +9768,20 @@
                                  (|#%app|
                                   app_8
                                   (fd-input-port-fd this-id_0)))))
-                          (if pos_0 (temp8.1 this-id_0 pos_0) #f))))
-                     ((this-id_0 pos77_0)
+                          (if pos_0
+                            (temp8.1
+                             this-id_0
+                             pos_0
+                             (fd-input-port-is-converted this-id_0))
+                            #f))))
+                     ((this-id_0 pos78_0)
                       (begin
                         (temp6.1$1 this-id_0)
                         (let ((app_8 set-file-position))
                           (|#%app|
                            app_8
                            (fd-input-port-fd this-id_0)
-                           pos77_0))))))
+                           pos78_0))))))
                    app_2
                    app_3
                    app_4
@@ -9736,19 +9793,63 @@
                    (|#%name|
                     read-in/inner
                     (lambda (this-id_0
-                             dest-bstr133_0
-                             start134_0
-                             end135_0
-                             copy?136_0)
+                             dest-bstr136_0
+                             start137_0
+                             end138_0
+                             copy?139_0
+                             to-buffer?140_0)
                       (begin
                         (let ((n_0
-                               (|#%app|
-                                rktio_read_in
-                                (unsafe-place-local-ref cell.1)
-                                (fd-input-port-fd this-id_0)
-                                dest-bstr133_0
-                                start134_0
-                                end135_0)))
+                               (if (if to-buffer?140_0
+                                     (|#%app|
+                                      rktio_fd_is_text_converted
+                                      (unsafe-place-local-ref cell.1)
+                                      (fd-input-port-fd this-id_0))
+                                     #f)
+                                 (begin
+                                   (if (let ((or-part_0
+                                              (not
+                                               (fd-input-port-is-converted
+                                                this-id_0))))
+                                         (if or-part_0
+                                           or-part_0
+                                           (<
+                                            (unsafe-bytes-length
+                                             (fd-input-port-is-converted
+                                              this-id_0))
+                                            end138_0)))
+                                     (let ((new-is-converted_0
+                                            (make-bytes end138_0)))
+                                       (begin
+                                         (if (fd-input-port-is-converted
+                                              this-id_0)
+                                           (unsafe-bytes-copy!
+                                            new-is-converted_0
+                                            0
+                                            (fd-input-port-is-converted
+                                             this-id_0))
+                                           (void))
+                                         (set-fd-input-port-is-converted!
+                                          this-id_0
+                                          new-is-converted_0)))
+                                     (void))
+                                   (let ((app_8 (fd-input-port-fd this-id_0)))
+                                     (|#%app|
+                                      rktio_read_converted_in
+                                      (unsafe-place-local-ref cell.1)
+                                      app_8
+                                      dest-bstr136_0
+                                      start137_0
+                                      end138_0
+                                      (fd-input-port-is-converted this-id_0)
+                                      start137_0)))
+                                 (|#%app|
+                                  rktio_read_in
+                                  (unsafe-place-local-ref cell.1)
+                                  (fd-input-port-fd this-id_0)
+                                  dest-bstr136_0
+                                  start137_0
+                                  end138_0))))
                           (if (vector? n_0)
                             (begin
                               (unsafe-end-atomic)
@@ -9776,11 +9877,11 @@
                    (|#%name| on-close (lambda (this-id_0) (begin (void))))
                    (|#%name|
                     raise-read-error
-                    (lambda (this-id_0 n195_0)
+                    (lambda (this-id_0 n202_0)
                       (begin
                         (raise-filesystem-error
                          #f
-                         n195_0
+                         n202_0
                          "error reading from stream port"))))))))))))))
 (define open-input-fd.1
   (|#%name|
@@ -9796,7 +9897,7 @@
                   (current-custodian)
                   custodian8_0)))
            (let ((app_0 (direct2.1 #f 0 0)))
-             (let ((temp224_0
+             (let ((temp232_0
                     (create-fd-input-port
                      fd-input-port-vtable.1
                      name12_0
@@ -9816,8 +9917,9 @@
                      'block
                      fd11_0
                      fd-refcount_0
+                     #f
                      #f)))
-               (finish-fd-input-port.1 cust_0 temp224_0)))))))))
+               (finish-fd-input-port.1 cust_0 temp232_0)))))))))
 (define finish-fd-input-port.1
   (|#%name|
    finish-fd-input-port
@@ -9834,7 +9936,7 @@
                 p16_0
                 (register-fd-close cust_0 fd_0 fd-refcount_0 #f p16_0))
                (finish-port/count p16_0)))))))))
-(define finish639
+(define finish_2363
   (make-struct-type-install-properties
    '(fd-output-port)
    8
@@ -9884,7 +9986,7 @@
    #f
    8
    255))
-(define effect_2896 (finish639 struct:fd-output-port))
+(define effect_2896 (finish_2363 struct:fd-output-port))
 (define create-fd-output-port
   (|#%name|
    create-fd-output-port
@@ -9946,7 +10048,7 @@
   (|#%name|
    set-fd-output-port-custodian-reference!
    (record-mutator struct:fd-output-port 7)))
-(define finish646
+(define finish_2810
   (make-struct-type-install-properties
    '(fd-output-port-methods)
    2
@@ -9967,7 +10069,7 @@
    #f
    2
    0))
-(define effect_1955 (finish646 struct:fd-output-port-methods.1))
+(define effect_1955 (finish_2810 struct:fd-output-port-methods.1))
 (define fd-output-port-methods26.1
   (|#%name|
    fd-output-port-methods
@@ -10057,11 +10159,11 @@
                          (fd-output-port-flush-handle this-id_0))
                         (void))
                       (set-fd-output-port-bstr! this-id_0 #f)
-                      (let ((fd255_0 (fd-output-port-fd this-id_0)))
-                        (let ((fd-refcount256_0
+                      (let ((fd263_0 (fd-output-port-fd this-id_0)))
+                        (let ((fd-refcount264_0
                                (fd-output-port-fd-refcount this-id_0)))
-                          (let ((fd255_1 fd255_0))
-                            (fd-close.1 #f fd255_1 fd-refcount256_0))))
+                          (let ((fd263_1 fd263_0))
+                            (fd-close.1 #f fd263_1 fd-refcount264_0))))
                       (|#%app|
                        1/unsafe-custodian-unregister
                        this-id_0
@@ -10087,33 +10189,33 @@
                                 (fd-output-port-end-pos this-id_0))))
                          (fx- app_4 (fd-output-port-start-pos this-id_0))))
                       #f)))))
-             ((this-id_0 pos257_0)
+             ((this-id_0 pos265_0)
               (begin
                 (|#%app| temp19.1 this-id_0 #f)
                 (if (fd-output-port-bstr this-id_0)
                   (void)
                   (check-not-closed 'file-position this-id_0))
                 (let ((app_4 set-file-position))
-                  (|#%app| app_4 (fd-output-port-fd this-id_0) pos257_0))))))
+                  (|#%app| app_4 (fd-output-port-fd this-id_0) pos265_0))))))
            (|#%name|
             buffer-mode
             (case-lambda
              ((this-id_0) (begin (fd-output-port-buffer-mode this-id_0)))
-             ((this-id_0 mode313_0)
-              (set-fd-output-port-buffer-mode! this-id_0 mode313_0))))
+             ((this-id_0 mode321_0)
+              (set-fd-output-port-buffer-mode! this-id_0 mode321_0))))
            (|#%name|
             write-out
             (lambda (this-id_0
-                     src-bstr369_0
-                     src-start370_0
-                     src-end371_0
-                     nonbuffer/nonblock?372_0
-                     enable-break?373_0
-                     copy?374_0)
+                     src-bstr377_0
+                     src-start378_0
+                     src-end379_0
+                     nonbuffer/nonblock?380_0
+                     enable-break?381_0
+                     copy?382_0)
               (begin
                 (begin
                   (|#%app| temp23.1 this-id_0)
-                  (if (fx= src-start370_0 src-end371_0)
+                  (if (fx= src-start378_0 src-end379_0)
                     (let ((or-part_0 (if (|#%app| temp18.1 this-id_0) 0 #f)))
                       (if or-part_0
                         or-part_0
@@ -10124,7 +10226,7 @@
                              (eq?
                               (fd-output-port-buffer-mode this-id_0)
                               'none))
-                          (if (not nonbuffer/nonblock?372_0)
+                          (if (not nonbuffer/nonblock?380_0)
                             (let ((app_4 (fd-output-port-end-pos this-id_0)))
                               (fx<
                                app_4
@@ -10133,7 +10235,7 @@
                             #f)
                           #f)
                       (let ((amt_0
-                             (let ((app_4 (fx- src-end371_0 src-start370_0)))
+                             (let ((app_4 (fx- src-end379_0 src-start378_0)))
                                (fxmin
                                 app_4
                                 (let ((app_5
@@ -10148,9 +10250,9 @@
                               (unsafe-bytes-copy!
                                app_4
                                app_5
-                               src-bstr369_0
-                               src-start370_0
-                               (fx+ src-start370_0 amt_0))))
+                               src-bstr377_0
+                               src-start378_0
+                               (fx+ src-start378_0 amt_0))))
                           (set-fd-output-port-end-pos!
                            this-id_0
                            (fx+ (fd-output-port-end-pos this-id_0) amt_0))
@@ -10160,10 +10262,10 @@
                             (|#%app|
                              temp20.1
                              this-id_0
-                             src-bstr369_0
-                             src-start370_0
-                             src-end371_0
-                             enable-break?373_0)
+                             src-bstr377_0
+                             src-start378_0
+                             src-end379_0
+                             enable-break?381_0)
                             (void))
                           (|#%app| temp22.1 this-id_0 amt_0)
                           amt_0))
@@ -10176,9 +10278,9 @@
                                 rktio_write_in
                                 (unsafe-place-local-ref cell.1)
                                 (fd-output-port-fd this-id_0)
-                                src-bstr369_0
-                                src-start370_0
-                                src-end371_0)))
+                                src-bstr377_0
+                                src-start378_0
+                                src-end379_0)))
                           (if (vector? n_0)
                             (begin
                               (unsafe-end-atomic)
@@ -10199,16 +10301,16 @@
            (|#%name| on-close (lambda (this-id_0) (begin (void))))
            (|#%name|
             raise-write-error
-            (lambda (this-id_0 n435_0)
+            (lambda (this-id_0 n443_0)
               (begin
                 (raise-filesystem-error
                  #f
-                 n435_0
+                 n443_0
                  "error writing to stream port"))))))))))
 (define temp22.1
   (|#%name|
    fast-mode!
-   (lambda (this-id_0 amt464_0)
+   (lambda (this-id_0 amt472_0)
      (begin
        (if (eq? (fd-output-port-buffer-mode this-id_0) 'block)
          (let ((b_0 (core-port-buffer this-id_0)))
@@ -10225,7 +10327,7 @@
                      (if o_0
                        (set-core-port-offset!
                         this-id_0
-                        (- (+ o_0 amt464_0) e_0))
+                        (- (+ o_0 amt472_0) e_0))
                        (void))))))))
          (void))))))
 (define temp23.1
@@ -10312,7 +10414,7 @@
 (define temp19.1
   (|#%name|
    flush-buffer-fully
-   (lambda (this-id_0 enable-break?601_0)
+   (lambda (this-id_0 enable-break?609_0)
      (begin
        (letrec*
         ((loop_0
@@ -10324,7 +10426,7 @@
                  (void)
                  (begin
                    (unsafe-end-atomic)
-                   (if enable-break?601_0
+                   (if enable-break?609_0
                      (sync/enable-break (core-output-port-evt this-id_0))
                      (sync (core-output-port-evt this-id_0)))
                    (unsafe-start-atomic)
@@ -10334,19 +10436,19 @@
   (|#%name|
    flush-buffer-fully-if-newline
    (lambda (this-id_0
-            src-bstr630_0
-            src-start631_0
-            src-end632_0
-            enable-break?633_0)
+            src-bstr638_0
+            src-start639_0
+            src-end640_0
+            enable-break?641_0)
      (begin
        (begin
          (call-with-values
           (lambda ()
             (unsafe-normalise-inputs
              unsafe-bytes-length
-             src-bstr630_0
-             src-start631_0
-             src-end632_0
+             src-bstr638_0
+             src-start639_0
+             src-end640_0
              1))
           (case-lambda
            ((v*_0 start*_0 stop*_0 step*_0)
@@ -10371,7 +10473,7 @@
                                      (if or-part_0 or-part_0 (eqv? b_0 13))))
                                 (begin
                                   (if newline?_0
-                                    (temp19.1 this-id_0 enable-break?633_0)
+                                    (temp19.1 this-id_0 enable-break?641_0)
                                     (void))
                                   (if newline?_0 (values) (next-k-proc_0)))))))
                         (values)))))))
@@ -10413,7 +10515,7 @@
                     (current-custodian)
                     custodian30_0)))
              (let ((app_0 (direct2.1 #f 0 0)))
-               (let ((temp692_0
+               (let ((temp700_0
                       (let ((app_1 (make-bytes 4096)))
                         (create-fd-output-port
                          fd-output-port-vtable.1
@@ -10442,7 +10544,7 @@
                              'block)
                            buffer-mode27_0)
                          #f))))
-                 (finish-fd-output-port.1 cust_0 plumber_0 temp692_0))))))))))
+                 (finish-fd-output-port.1 cust_0 plumber_0 temp700_0))))))))))
 (define finish-fd-output-port.1
   (|#%name|
    finish-fd-output-port
@@ -10547,7 +10649,7 @@
                      (format-rktio-message 'file-position r_0 base-msg_0)))
                 (|#%app| exn:fail app_0 (current-continuation-marks)))))))
         (void)))))
-(define finish674
+(define finish_2118
   (make-struct-type-install-properties
    '(fd-evt)
    3
@@ -10618,7 +10720,7 @@
    #f
    3
    4))
-(define effect_2660 (finish674 struct:fd-evt))
+(define effect_2660 (finish_2118 struct:fd-evt))
 (define fd-evt44.1
   (|#%name|
    fd-evt
@@ -10686,7 +10788,7 @@
          v
          'fd-evt
          'closed))))))
-(define finish683
+(define finish_2932
   (make-struct-type-install-properties
    '(rktio-fd-flushed-evt)
    1
@@ -10731,7 +10833,7 @@
    #f
    1
    0))
-(define effect_2170 (finish683 struct:rktio-fd-flushed-evt))
+(define effect_2170 (finish_2932 struct:rktio-fd-flushed-evt))
 (define rktio-fd-flushed-evt45.1
   (|#%name|
    rktio-fd-flushed-evt
@@ -11478,7 +11580,7 @@
                                     (loop_0 (fx+ i_0 1))))
                                 (loop_0 (fx+ i_0 1)))))))))))
                  (loop_0 pos_0))))))))))
-(define finish696
+(define finish_2338
   (make-struct-type-install-properties
    '(progress-evt)
    2
@@ -11502,7 +11604,7 @@
    #f
    2
    0))
-(define effect_2490 (finish696 struct:progress-evt))
+(define effect_2490 (finish_2338 struct:progress-evt))
 (define progress-evt1.1
   (|#%name|
    progress-evt
@@ -14801,7 +14903,7 @@
       (begin
         (unsafe-bytes-set! out-bstr_0 j_0 lo_0)
         (unsafe-bytes-set! out-bstr_0 (+ j_0 1) hi_0)))))
-(define finish724
+(define finish_2760
   (make-struct-type-install-properties
    '(utf-8-converter)
    2
@@ -14822,7 +14924,7 @@
    #f
    2
    0))
-(define effect_2402 (finish724 struct:utf-8-converter))
+(define effect_2402 (finish_2760 struct:utf-8-converter))
 (define utf-8-converter1.1
   (|#%name|
    utf-8-converter
@@ -15735,7 +15837,7 @@
                                    (done_0 'error)))
                                (continue_0 v_0 (+ i_0 2)))))))))))))))
         (loop_0 in-start20_0 out-start23_0))))))
-(define finish775
+(define finish_2770
   (make-struct-type-install-properties
    '(bytes-converter)
    2
@@ -15756,7 +15858,7 @@
    #f
    2
    3))
-(define effect_2496 (finish775 struct:bytes-converter))
+(define effect_2496 (finish_2770 struct:bytes-converter))
 (define bytes-converter1.1
   (|#%name|
    bytes-converter
@@ -16612,7 +16714,7 @@
                 (args (raise-binding-result-arity-error 4 args))))
               (void)))
           (check-not-unsafe-undefined bstr_0 'bstr_119))))))
-(define finish800
+(define finish_1919
   (make-struct-type-install-properties
    '(cache)
    4
@@ -16633,7 +16735,7 @@
    #f
    4
    15))
-(define effect_2561 (finish800 struct:cache))
+(define effect_2561 (finish_1919 struct:cache))
 (define cache1.1
   (|#%name|
    cache
@@ -16986,7 +17088,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 finish807
+(define finish_2714
   (make-struct-type-install-properties
    '(path)
    2
@@ -17032,7 +17134,7 @@
    #f
    2
    0))
-(define effect_2995 (finish807 struct:path))
+(define effect_2995 (finish_2714 struct:path))
 (define path1.1
   (|#%name|
    path
@@ -18288,7 +18390,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 finish816
+(define finish_2933
   (make-struct-type-install-properties
    '(bytes-input-port)
    3
@@ -18309,7 +18411,7 @@
    #f
    3
    7))
-(define effect_2847 (finish816 struct:bytes-input-port))
+(define effect_2847 (finish_2933 struct:bytes-input-port))
 (define create-bytes-input-port
   (|#%name|
    create-bytes-input-port
@@ -18337,7 +18439,7 @@
   (|#%name|
    set-bytes-input-port-alt-pos!
    (record-mutator struct:bytes-input-port 2)))
-(define finish819
+(define finish_2871
   (make-struct-type-install-properties
    '(bytes-input-port-methods)
    0
@@ -18358,7 +18460,7 @@
    #f
    0
    0))
-(define effect_2130 (finish819 struct:bytes-input-port-methods.1))
+(define effect_2130 (finish_2871 struct:bytes-input-port-methods.1))
 (define bytes-input-port-methods4.1
   (|#%name|
    bytes-input-port-methods
@@ -18568,7 +18670,7 @@
       bstr_0
       0
       #f))))
-(define finish827
+(define finish_2411
   (make-struct-type-install-properties
    '(bytes-output-port)
    3
@@ -18589,7 +18691,7 @@
    #f
    3
    7))
-(define effect_2052 (finish827 struct:bytes-output-port))
+(define effect_2052 (finish_2411 struct:bytes-output-port))
 (define create-bytes-output-port
   (|#%name|
    create-bytes-output-port
@@ -18621,7 +18723,7 @@
   (|#%name|
    set-bytes-output-port-max-pos!
    (record-mutator struct:bytes-output-port 2)))
-(define finish830
+(define finish_2698
   (make-struct-type-install-properties
    '(bytes-output-port-methods)
    2
@@ -18642,7 +18744,7 @@
    #f
    2
    0))
-(define effect_2430 (finish830 struct:bytes-output-port-methods.1))
+(define effect_2430 (finish_2698 struct:bytes-output-port-methods.1))
 (define bytes-output-port-methods8.1
   (|#%name|
    bytes-output-port-methods
@@ -19074,7 +19176,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 finish846
+(define finish_2069
   (make-struct-type-install-properties
    '(max-output-port)
    2
@@ -19095,7 +19197,7 @@
    #f
    2
    3))
-(define effect_3019 (finish846 struct:max-output-port))
+(define effect_3019 (finish_2069 struct:max-output-port))
 (define create-max-output-port
   (|#%name|
    create-max-output-port
@@ -19115,7 +19217,7 @@
   (|#%name|
    set-max-output-port-max-length!
    (record-mutator struct:max-output-port 1)))
-(define finish849
+(define finish_2618
   (make-struct-type-install-properties
    '(max-output-port-methods)
    0
@@ -19136,7 +19238,7 @@
    #f
    0
    0))
-(define effect_2933 (finish849 struct:max-output-port-methods.1))
+(define effect_2933 (finish_2618 struct:max-output-port-methods.1))
 (define max-output-port-methods1.1
   (|#%name|
    max-output-port-methods
@@ -20037,7 +20139,7 @@
   (lambda (mode_0)
     (let ((or-part_0 (eq? mode_0 0)))
       (if or-part_0 or-part_0 (eq? mode_0 1)))))
-(define finish863
+(define finish_2460
   (make-struct-type-install-properties
    '(nowhere-output-port)
    0
@@ -20058,7 +20160,7 @@
    #f
    0
    0))
-(define effect_2267 (finish863 struct:nowhere-output-port))
+(define effect_2267 (finish_2460 struct:nowhere-output-port))
 (define create-nowhere-output-port
   (|#%name|
    create-nowhere-output-port
@@ -20068,7 +20170,7 @@
   (|#%name|
    nowhere-output-port?
    (record-predicate struct:nowhere-output-port)))
-(define finish866
+(define finish_2952
   (make-struct-type-install-properties
    '(nowhere-output-port-methods)
    0
@@ -20089,7 +20191,7 @@
    #f
    0
    0))
-(define effect_2301 (finish866 struct:nowhere-output-port-methods.1))
+(define effect_2301 (finish_2952 struct:nowhere-output-port-methods.1))
 (define nowhere-output-port-methods1.1
   (|#%name|
    nowhere-output-port-methods
@@ -20315,7 +20417,7 @@
                               #f)
                             fuel_1)))))))))))))
      (quick-no-graph?_0 v_0 fuel_0))))
-(define finish883
+(define finish_2175
   (make-struct-type-install-properties
    '(as-constructor)
    1
@@ -20336,7 +20438,7 @@
    #f
    1
    0))
-(define effect_2645 (finish883 struct:as-constructor))
+(define effect_2645 (finish_2175 struct:as-constructor))
 (define as-constructor1.1
   (|#%name|
    as-constructor
@@ -23313,7 +23415,7 @@
           (if (letter-drive-start? s_0 (unsafe-bytes-length s_0))
             (just-separators-after? s_0 2)
             #f))))))
-(define finish963
+(define finish_3672
   (make-struct-type-install-properties
    '(starting-point)
    7
@@ -23334,7 +23436,7 @@
    #f
    7
    0))
-(define effect_2521 (finish963 struct:starting-point))
+(define effect_2521 (finish_3672 struct:starting-point))
 (define starting-point7.1
   (|#%name|
    starting-point
@@ -25304,7 +25406,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 finish1005
+(define finish_2262
   (make-struct-type-install-properties
    '(security-guard)
    4
@@ -25325,7 +25427,7 @@
    #f
    4
    0))
-(define effect_2369 (finish1005 struct:security-guard))
+(define effect_2369 (finish_2262 struct:security-guard))
 (define security-guard1.1
   (|#%name|
    security-guard
@@ -25886,7 +25988,7 @@
                  mode->flags
                  (lambda (mode_0)
                    (begin
-                     (if (eq? mode_0 'test)
+                     (if (eq? mode_0 'text)
                        4
                        (if (if (eq? mode_0 'truncate)
                              #t
@@ -27113,80 +27215,42 @@
                                                                      (wrap-procedure-result_0
                                                                       r_0)
                                                                      r_0)))))))))))
-                                                  (letrec*
-                                                   ((peek-in_0
-                                                     (|#%name|
-                                                      peek-in
-                                                      (lambda (self_0
+                                                  (let ((read-in/inner_0
+                                                         (|#%name|
+                                                          read-in/inner
+                                                          (lambda (self_0
+                                                                   dest-bstr_0
+                                                                   dest-start_0
+                                                                   dest-end_0
+                                                                   copy?_0
+                                                                   to-buffer_0)
+                                                            (begin
+                                                              (read-in_0
+                                                               self_0
                                                                dest-bstr_0
                                                                dest-start_0
                                                                dest-end_0
-                                                               skip-k_0
-                                                               progress-evt_0
-                                                               copy?_0)
-                                                        (begin
-                                                          (if input-pipe_0
-                                                            (if (<=
-                                                                 (1/pipe-content-length
-                                                                  input-pipe_0)
-                                                                 skip-k_0)
-                                                              (begin
-                                                                (set! input-pipe_0
-                                                                  #f)
-                                                                (peek-in_0
-                                                                 self_0
+                                                               copy?_0))))))
+                                                    (letrec*
+                                                     ((peek-in_0
+                                                       (|#%name|
+                                                        peek-in
+                                                        (lambda (self_0
                                                                  dest-bstr_0
                                                                  dest-start_0
                                                                  dest-end_0
                                                                  skip-k_0
                                                                  progress-evt_0
-                                                                 copy?_0))
-                                                              (let ((o_0
-                                                                     input-pipe_0))
-                                                                (|#%app|
-                                                                 (core-input-port-methods-peek-in.1
-                                                                  (core-port-vtable
-                                                                   o_0))
-                                                                 o_0
-                                                                 dest-bstr_0
-                                                                 dest-start_0
-                                                                 dest-end_0
-                                                                 skip-k_0
-                                                                 progress-evt_0
-                                                                 copy?_0)))
-                                                            (let ((r_0
-                                                                   (with-continuation-mark*
-                                                                    push-authentic
-                                                                    break-enabled-key
-                                                                    (make-thread-cell
-                                                                     #f)
-                                                                    (begin
-                                                                      (check-for-break)
-                                                                      (begin
-                                                                        (unsafe-end-atomic)
-                                                                        (begin0
-                                                                          (protect-in_0
-                                                                           dest-bstr_0
-                                                                           dest-start_0
-                                                                           dest-end_0
-                                                                           copy?_0
-                                                                           (lambda (user-bstr_0)
-                                                                             (|#%app|
-                                                                              user-peek-in9_0
-                                                                              user-bstr_0
-                                                                              skip-k_0
-                                                                              progress-evt_0)))
-                                                                          (unsafe-start-atomic)))))))
-                                                              (begin
-                                                                (check-read-result_0
-                                                                 progress-evt_0
-                                                                 #t
-                                                                 '|user port peek|
-                                                                 r_0
-                                                                 dest-start_0
-                                                                 dest-end_0)
-                                                                (if (pipe-input-port?*
-                                                                     r_0)
+                                                                 copy?_0)
+                                                          (begin
+                                                            (if input-pipe_0
+                                                              (if (<=
+                                                                   (1/pipe-content-length
+                                                                    input-pipe_0)
+                                                                   skip-k_0)
+                                                                (begin
+                                                                  (set! input-pipe_0
+                                                                    #f)
                                                                   (peek-in_0
                                                                    self_0
                                                                    dest-bstr_0
@@ -27194,282 +27258,336 @@
                                                                    dest-end_0
                                                                    skip-k_0
                                                                    progress-evt_0
-                                                                   copy?_0)
-                                                                  (if (evt?
+                                                                   copy?_0))
+                                                                (let ((o_0
+                                                                       input-pipe_0))
+                                                                  (|#%app|
+                                                                   (core-input-port-methods-peek-in.1
+                                                                    (core-port-vtable
+                                                                     o_0))
+                                                                   o_0
+                                                                   dest-bstr_0
+                                                                   dest-start_0
+                                                                   dest-end_0
+                                                                   skip-k_0
+                                                                   progress-evt_0
+                                                                   copy?_0)))
+                                                              (let ((r_0
+                                                                     (with-continuation-mark*
+                                                                      push-authentic
+                                                                      break-enabled-key
+                                                                      (make-thread-cell
+                                                                       #f)
+                                                                      (begin
+                                                                        (check-for-break)
+                                                                        (begin
+                                                                          (unsafe-end-atomic)
+                                                                          (begin0
+                                                                            (protect-in_0
+                                                                             dest-bstr_0
+                                                                             dest-start_0
+                                                                             dest-end_0
+                                                                             copy?_0
+                                                                             (lambda (user-bstr_0)
+                                                                               (|#%app|
+                                                                                user-peek-in9_0
+                                                                                user-bstr_0
+                                                                                skip-k_0
+                                                                                progress-evt_0)))
+                                                                            (unsafe-start-atomic)))))))
+                                                                (begin
+                                                                  (check-read-result_0
+                                                                   progress-evt_0
+                                                                   #t
+                                                                   '|user port peek|
+                                                                   r_0
+                                                                   dest-start_0
+                                                                   dest-end_0)
+                                                                  (if (pipe-input-port?*
                                                                        r_0)
-                                                                    (wrap-check-read-evt-result_0
-                                                                     '|user port peek|
-                                                                     r_0
+                                                                    (peek-in_0
+                                                                     self_0
+                                                                     dest-bstr_0
                                                                      dest-start_0
                                                                      dest-end_0
-                                                                     #t
-                                                                     progress-evt_0)
-                                                                    (if (procedure?
+                                                                     skip-k_0
+                                                                     progress-evt_0
+                                                                     copy?_0)
+                                                                    (if (evt?
                                                                          r_0)
-                                                                      (wrap-procedure-result_0
-                                                                       r_0)
-                                                                      r_0)))))))))))
-                                                   (let ((byte-ready_0
-                                                          (|#%name|
-                                                           byte-ready
-                                                           (lambda (self_0
-                                                                    work-done!_0)
-                                                             (begin
-                                                               (if (if input-pipe_0
-                                                                     (positive?
-                                                                      (1/pipe-content-length
-                                                                       input-pipe_0))
-                                                                     #f)
-                                                                 #t
-                                                                 (let ((bstr_0
-                                                                        (make-bytes
-                                                                         1)))
-                                                                   (let ((v_0
-                                                                          (peek-in_0
-                                                                           self_0
-                                                                           bstr_0
-                                                                           0
-                                                                           1
-                                                                           0
-                                                                           #f
-                                                                           #f)))
-                                                                     (begin
-                                                                       (|#%app|
-                                                                        work-done!_0)
-                                                                       (if (evt?
-                                                                            v_0)
-                                                                         v_0
-                                                                         (not
-                                                                          (eqv?
-                                                                           v_0
-                                                                           0))))))))))))
-                                                     (let ((close_0
+                                                                      (wrap-check-read-evt-result_0
+                                                                       '|user port peek|
+                                                                       r_0
+                                                                       dest-start_0
+                                                                       dest-end_0
+                                                                       #t
+                                                                       progress-evt_0)
+                                                                      (if (procedure?
+                                                                           r_0)
+                                                                        (wrap-procedure-result_0
+                                                                         r_0)
+                                                                        r_0)))))))))))
+                                                     (let ((byte-ready_0
                                                             (|#%name|
-                                                             close
-                                                             (lambda (self_0)
+                                                             byte-ready
+                                                             (lambda (self_0
+                                                                      work-done!_0)
                                                                (begin
-                                                                 (begin
-                                                                   (unsafe-end-atomic)
-                                                                   (|#%app|
-                                                                    user-close10_0)
-                                                                   (unsafe-start-atomic)))))))
-                                                       (let ((get-progress-evt_0
+                                                                 (if (if input-pipe_0
+                                                                       (positive?
+                                                                        (1/pipe-content-length
+                                                                         input-pipe_0))
+                                                                       #f)
+                                                                   #t
+                                                                   (let ((bstr_0
+                                                                          (make-bytes
+                                                                           1)))
+                                                                     (let ((v_0
+                                                                            (peek-in_0
+                                                                             self_0
+                                                                             bstr_0
+                                                                             0
+                                                                             1
+                                                                             0
+                                                                             #f
+                                                                             #f)))
+                                                                       (begin
+                                                                         (|#%app|
+                                                                          work-done!_0)
+                                                                         (if (evt?
+                                                                              v_0)
+                                                                           v_0
+                                                                           (not
+                                                                            (eqv?
+                                                                             v_0
+                                                                             0))))))))))))
+                                                       (let ((close_0
                                                               (|#%name|
-                                                               get-progress-evt
+                                                               close
                                                                (lambda (self_0)
                                                                  (begin
-                                                                   (let ((r_0
-                                                                          (|#%app|
-                                                                           user-get-progress-evt1_0)))
-                                                                     (begin
-                                                                       (if (evt?
-                                                                            r_0)
-                                                                         (void)
-                                                                         (raise-result-error
-                                                                          '|user port progress-evt|
-                                                                          "evt?"
-                                                                          r_0))
-                                                                       r_0)))))))
-                                                         (let ((commit_0
+                                                                   (begin
+                                                                     (unsafe-end-atomic)
+                                                                     (|#%app|
+                                                                      user-close10_0)
+                                                                     (unsafe-start-atomic)))))))
+                                                         (let ((get-progress-evt_0
                                                                 (|#%name|
-                                                                 commit
-                                                                 (lambda (self_0
-                                                                          amt_0
-                                                                          evt_0
-                                                                          ext-evt_0
-                                                                          finish_0)
+                                                                 get-progress-evt
+                                                                 (lambda (self_0)
                                                                    (begin
                                                                      (let ((r_0
-                                                                            (with-continuation-mark*
-                                                                             push-authentic
-                                                                             break-enabled-key
-                                                                             (make-thread-cell
-                                                                              #f)
-                                                                             (begin
-                                                                               (check-for-break)
+                                                                            (|#%app|
+                                                                             user-get-progress-evt1_0)))
+                                                                       (begin
+                                                                         (if (evt?
+                                                                              r_0)
+                                                                           (void)
+                                                                           (raise-result-error
+                                                                            '|user port progress-evt|
+                                                                            "evt?"
+                                                                            r_0))
+                                                                         r_0)))))))
+                                                           (let ((commit_0
+                                                                  (|#%name|
+                                                                   commit
+                                                                   (lambda (self_0
+                                                                            amt_0
+                                                                            evt_0
+                                                                            ext-evt_0
+                                                                            finish_0)
+                                                                     (begin
+                                                                       (let ((r_0
+                                                                              (with-continuation-mark*
+                                                                               push-authentic
+                                                                               break-enabled-key
+                                                                               (make-thread-cell
+                                                                                #f)
                                                                                (begin
-                                                                                 (unsafe-end-atomic)
-                                                                                 (begin0
-                                                                                   (|#%app|
-                                                                                    user-commit2_0
-                                                                                    amt_0
-                                                                                    evt_0
-                                                                                    ext-evt_0)
-                                                                                   (unsafe-start-atomic)))))))
-                                                                       (if (not
-                                                                            r_0)
-                                                                         #f
-                                                                         (if (bytes?
+                                                                                 (check-for-break)
+                                                                                 (begin
+                                                                                   (unsafe-end-atomic)
+                                                                                   (begin0
+                                                                                     (|#%app|
+                                                                                      user-commit2_0
+                                                                                      amt_0
+                                                                                      evt_0
+                                                                                      ext-evt_0)
+                                                                                     (unsafe-start-atomic)))))))
+                                                                         (if (not
                                                                               r_0)
-                                                                           (begin
-                                                                             (|#%app|
-                                                                              finish_0
-                                                                              r_0)
-                                                                             #t)
-                                                                           (begin
-                                                                             (|#%app|
-                                                                              finish_0
-                                                                              (make-bytes
-                                                                               amt_0
-                                                                               120))
-                                                                             #t)))))))))
-                                                           (let ((get-location_0
-                                                                  (if user-get-location3_0
-                                                                    (make-get-location
-                                                                     user-get-location3_0)
-                                                                    #f)))
-                                                             (let ((count-lines!_0
-                                                                    (if user-count-lines!4_0
-                                                                      (|#%name|
-                                                                       count-lines!
-                                                                       (lambda (self_0)
-                                                                         (begin
-                                                                           (begin
-                                                                             (unsafe-end-atomic)
-                                                                             (|#%app|
-                                                                              user-count-lines!4_0)
-                                                                             (unsafe-start-atomic)))))
+                                                                           #f
+                                                                           (if (bytes?
+                                                                                r_0)
+                                                                             (begin
+                                                                               (|#%app|
+                                                                                finish_0
+                                                                                r_0)
+                                                                               #t)
+                                                                             (begin
+                                                                               (|#%app|
+                                                                                finish_0
+                                                                                (make-bytes
+                                                                                 amt_0
+                                                                                 120))
+                                                                               #t)))))))))
+                                                             (let ((get-location_0
+                                                                    (if user-get-location3_0
+                                                                      (make-get-location
+                                                                       user-get-location3_0)
                                                                       #f)))
-                                                               (call-with-values
-                                                                (lambda ()
-                                                                  (make-init-offset+file-position
-                                                                   user-init-position5_0))
-                                                                (case-lambda
-                                                                 ((init-offset_0
-                                                                   file-position_0)
-                                                                  (let ((buffer-mode_0
-                                                                         (if user-buffer-mode6_0
-                                                                           (make-buffer-mode.1
-                                                                            #f
-                                                                            user-buffer-mode6_0)
-                                                                           #f)))
-                                                                    (finish-port/count
-                                                                     (if user-peek-in9_0
-                                                                       (let ((app_0
-                                                                              (let ((app_0
-                                                                                     (core-input-port-methods-prepare-change.1
-                                                                                      core-input-port-vtable.1)))
-                                                                                (let ((app_1
-                                                                                       (if (1/input-port?
-                                                                                            user-read-in8_0)
-                                                                                         user-read-in8_0
-                                                                                         read-in_0)))
-                                                                                  (let ((app_2
+                                                               (let ((count-lines!_0
+                                                                      (if user-count-lines!4_0
+                                                                        (|#%name|
+                                                                         count-lines!
+                                                                         (lambda (self_0)
+                                                                           (begin
+                                                                             (begin
+                                                                               (unsafe-end-atomic)
+                                                                               (|#%app|
+                                                                                user-count-lines!4_0)
+                                                                               (unsafe-start-atomic)))))
+                                                                        #f)))
+                                                                 (call-with-values
+                                                                  (lambda ()
+                                                                    (make-init-offset+file-position
+                                                                     user-init-position5_0))
+                                                                  (case-lambda
+                                                                   ((init-offset_0
+                                                                     file-position_0)
+                                                                    (let ((buffer-mode_0
+                                                                           (if user-buffer-mode6_0
+                                                                             (make-buffer-mode.1
+                                                                              #f
+                                                                              user-buffer-mode6_0)
+                                                                             #f)))
+                                                                      (finish-port/count
+                                                                       (if user-peek-in9_0
+                                                                         (let ((app_0
+                                                                                (let ((app_0
+                                                                                       (core-input-port-methods-prepare-change.1
+                                                                                        core-input-port-vtable.1)))
+                                                                                  (let ((app_1
                                                                                          (if (1/input-port?
-                                                                                              user-peek-in9_0)
-                                                                                           user-peek-in9_0
-                                                                                           peek-in_0)))
-                                                                                    (let ((app_3
+                                                                                              user-read-in8_0)
+                                                                                           user-read-in8_0
+                                                                                           read-in_0)))
+                                                                                    (let ((app_2
                                                                                            (if (1/input-port?
                                                                                                 user-peek-in9_0)
                                                                                              user-peek-in9_0
-                                                                                             byte-ready_0)))
-                                                                                      (let ((app_4
-                                                                                             (if user-get-progress-evt1_0
-                                                                                               get-progress-evt_0
-                                                                                               #f)))
-                                                                                        (core-input-port-methods6.1
-                                                                                         close_0
-                                                                                         count-lines!_0
-                                                                                         get-location_0
-                                                                                         file-position_0
-                                                                                         buffer-mode_0
-                                                                                         app_0
-                                                                                         app_1
-                                                                                         app_2
-                                                                                         app_3
-                                                                                         app_4
-                                                                                         (if user-commit2_0
-                                                                                           commit_0
-                                                                                           #f)))))))))
-                                                                         (create-core-input-port
-                                                                          app_0
-                                                                          name7_0
-                                                                          (direct2.1
-                                                                           #f
-                                                                           0
-                                                                           0)
-                                                                          #f
-                                                                          #f
-                                                                          init-offset_0
-                                                                          #f
-                                                                          #f
-                                                                          #f))
-                                                                       (let ((app_0
-                                                                              (let ((app_0
-                                                                                     (if buffer-mode_0
-                                                                                       buffer-mode_0
-                                                                                       (case-lambda
-                                                                                        ((self_0)
-                                                                                         (temp9.1
-                                                                                          self_0))
-                                                                                        ((self_0
-                                                                                          mode_0)
-                                                                                         (temp9.1
-                                                                                          self_0
-                                                                                          mode_0))))))
-                                                                                (let ((app_1
-                                                                                       (core-input-port-methods-prepare-change.1
-                                                                                        peek-via-read-input-port-vtable.1)))
-                                                                                  (let ((app_2
-                                                                                         (core-input-port-methods-read-in.1
-                                                                                          peek-via-read-input-port-vtable.1)))
-                                                                                    (let ((app_3
-                                                                                           (core-input-port-methods-peek-in.1
-                                                                                            peek-via-read-input-port-vtable.1)))
-                                                                                      (let ((app_4
-                                                                                             (core-input-port-methods-byte-ready.1
-                                                                                              peek-via-read-input-port-vtable.1)))
-                                                                                        (let ((app_5
-                                                                                               (core-input-port-methods-get-progress-evt.1
-                                                                                                peek-via-read-input-port-vtable.1)))
-                                                                                          (peek-via-read-input-port-methods10.1
-                                                                                           (values
-                                                                                            (lambda (self_0)
-                                                                                              (begin
-                                                                                                (close_0
-                                                                                                 self_0)
-                                                                                                (temp7.1
-                                                                                                 self_0))))
+                                                                                             peek-in_0)))
+                                                                                      (let ((app_3
+                                                                                             (if (1/input-port?
+                                                                                                  user-peek-in9_0)
+                                                                                               user-peek-in9_0
+                                                                                               byte-ready_0)))
+                                                                                        (let ((app_4
+                                                                                               (if user-get-progress-evt1_0
+                                                                                                 get-progress-evt_0
+                                                                                                 #f)))
+                                                                                          (core-input-port-methods6.1
+                                                                                           close_0
                                                                                            count-lines!_0
                                                                                            get-location_0
                                                                                            file-position_0
+                                                                                           buffer-mode_0
                                                                                            app_0
                                                                                            app_1
                                                                                            app_2
                                                                                            app_3
                                                                                            app_4
-                                                                                           app_5
-                                                                                           (core-input-port-methods-commit.1
-                                                                                            peek-via-read-input-port-vtable.1)
-                                                                                           read-in_0)))))))))
-                                                                         (let ((app_1
-                                                                                (direct2.1
-                                                                                 #f
-                                                                                 0
-                                                                                 0)))
-                                                                           (create-peek-via-read-input-port
+                                                                                           (if user-commit2_0
+                                                                                             commit_0
+                                                                                             #f)))))))))
+                                                                           (create-core-input-port
                                                                             app_0
                                                                             name7_0
-                                                                            app_1
+                                                                            (direct2.1
+                                                                             #f
+                                                                             0
+                                                                             0)
                                                                             #f
                                                                             #f
                                                                             init-offset_0
                                                                             #f
                                                                             #f
-                                                                            #f
-                                                                            #f
-                                                                            #f
-                                                                            (make-bytes
-                                                                             4096)
-                                                                            0
-                                                                            0
-                                                                            #f
-                                                                            'block)))))))
-                                                                 (args
-                                                                  (raise-binding-result-arity-error
-                                                                   2
-                                                                   args)))))))))))))))))))))))))))))))))))
+                                                                            #f))
+                                                                         (let ((app_0
+                                                                                (let ((app_0
+                                                                                       (if buffer-mode_0
+                                                                                         buffer-mode_0
+                                                                                         (case-lambda
+                                                                                          ((self_0)
+                                                                                           (temp9.1
+                                                                                            self_0))
+                                                                                          ((self_0
+                                                                                            mode_0)
+                                                                                           (temp9.1
+                                                                                            self_0
+                                                                                            mode_0))))))
+                                                                                  (let ((app_1
+                                                                                         (core-input-port-methods-prepare-change.1
+                                                                                          peek-via-read-input-port-vtable.1)))
+                                                                                    (let ((app_2
+                                                                                           (core-input-port-methods-read-in.1
+                                                                                            peek-via-read-input-port-vtable.1)))
+                                                                                      (let ((app_3
+                                                                                             (core-input-port-methods-peek-in.1
+                                                                                              peek-via-read-input-port-vtable.1)))
+                                                                                        (let ((app_4
+                                                                                               (core-input-port-methods-byte-ready.1
+                                                                                                peek-via-read-input-port-vtable.1)))
+                                                                                          (let ((app_5
+                                                                                                 (core-input-port-methods-get-progress-evt.1
+                                                                                                  peek-via-read-input-port-vtable.1)))
+                                                                                            (peek-via-read-input-port-methods10.1
+                                                                                             (values
+                                                                                              (lambda (self_0)
+                                                                                                (begin
+                                                                                                  (close_0
+                                                                                                   self_0)
+                                                                                                  (temp7.1
+                                                                                                   self_0))))
+                                                                                             count-lines!_0
+                                                                                             get-location_0
+                                                                                             file-position_0
+                                                                                             app_0
+                                                                                             app_1
+                                                                                             app_2
+                                                                                             app_3
+                                                                                             app_4
+                                                                                             app_5
+                                                                                             (core-input-port-methods-commit.1
+                                                                                              peek-via-read-input-port-vtable.1)
+                                                                                             read-in/inner_0)))))))))
+                                                                           (let ((app_1
+                                                                                  (direct2.1
+                                                                                   #f
+                                                                                   0
+                                                                                   0)))
+                                                                             (create-peek-via-read-input-port
+                                                                              app_0
+                                                                              name7_0
+                                                                              app_1
+                                                                              #f
+                                                                              #f
+                                                                              init-offset_0
+                                                                              #f
+                                                                              #f
+                                                                              #f
+                                                                              #f
+                                                                              #f
+                                                                              (make-bytes
+                                                                               4096)
+                                                                              0
+                                                                              0
+                                                                              #f
+                                                                              'block)))))))
+                                                                   (args
+                                                                    (raise-binding-result-arity-error
+                                                                     2
+                                                                     args))))))))))))))))))))))))))))))))))))
     (|#%name|
      make-input-port
      (case-lambda
@@ -29764,7 +29882,7 @@
       (bytes->immutable-bytes
        (1/string->bytes/locale (string-foldcase (1/bytes->string/locale k_0))))
       k_0)))
-(define finish1090
+(define finish_2186
   (make-struct-type-install-properties
    '(environment-variables)
    1
@@ -29785,7 +29903,7 @@
    #f
    1
    1))
-(define effect_2329 (finish1090 struct:environment-variables))
+(define effect_2329 (finish_2186 struct:environment-variables))
 (define environment-variables1.1
   (|#%name|
    environment-variables
@@ -31498,7 +31616,7 @@
            #f))))))
 (define adjust-path
   (lambda (p_0) (if (is-path? p_0) (relative-to-user-directory p_0) p_0)))
-(define finish1167
+(define finish_1890
   (make-struct-type-install-properties
    '(logger)
    11
@@ -31519,7 +31637,7 @@
    #f
    11
    376))
-(define effect_2687 (finish1167 struct:logger))
+(define effect_2687 (finish_1890 struct:logger))
 (define logger1.1
   (|#%name|
    logger
@@ -31969,7 +32087,7 @@
      (loop_0 filters_0 'none))))
 (define level->user-representation
   (lambda (lvl_0) (if (eq? lvl_0 'none) #f lvl_0)))
-(define finish1192
+(define finish_2164
   (make-struct-type-install-properties
    '(queue)
    2
@@ -31990,7 +32108,7 @@
    #f
    2
    3))
-(define effect_2998 (finish1192 struct:queue))
+(define effect_2998 (finish_2164 struct:queue))
 (define queue1.1
   (|#%name|
    queue
@@ -32003,7 +32121,7 @@
   (|#%name| set-queue-start! (record-mutator struct:queue 0)))
 (define set-queue-end!
   (|#%name| set-queue-end! (record-mutator struct:queue 1)))
-(define finish1194
+(define finish_2845
   (make-struct-type-install-properties
    '(node)
    3
@@ -32024,7 +32142,7 @@
    #f
    3
    6))
-(define effect_2547 (finish1194 struct:node))
+(define effect_2547 (finish_2845 struct:node))
 (define node2.1
   (|#%name|
    node
@@ -32067,7 +32185,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 finish1199
+(define finish_2335
   (make-struct-type-install-properties
    '(log-receiver)
    1
@@ -32088,7 +32206,7 @@
    #f
    1
    0))
-(define effect_2969 (finish1199 struct:log-receiver))
+(define effect_2969 (finish_2335 struct:log-receiver))
 (define log-receiver1.1
   (|#%name|
    log-receiver
@@ -32125,7 +32243,7 @@
 (define-values
  (prop:receiver-send receiver-send? receiver-send-ref)
  (make-struct-type-property 'receiver-send))
-(define finish1203
+(define finish_2611
   (make-struct-type-install-properties
    '(log-receiver)
    3
@@ -32200,7 +32318,7 @@
    #f
    3
    0))
-(define effect_2324 (finish1203 struct:queue-log-receiver))
+(define effect_2324 (finish_2611 struct:queue-log-receiver))
 (define queue-log-receiver2.1
   (|#%name|
    queue-log-receiver
@@ -32306,7 +32424,7 @@
           (begin-unsafe (not (queue-start q_0))))
       (set-box! (queue-log-receiver-backref lr_0) lr_0)
       (void))))
-(define finish1215
+(define finish_2868
   (make-struct-type-install-properties
    '(stdio-log-receiver)
    2
@@ -32362,7 +32480,7 @@
    #f
    2
    0))
-(define effect_2591 (finish1215 struct:stdio-log-receiver))
+(define effect_2591 (finish_2868 struct:stdio-log-receiver))
 (define stdio-log-receiver3.1
   (|#%name|
    stdio-log-receiver
@@ -32452,7 +32570,7 @@
      args_0
      'make-stdio-log-receiver
      1)))
-(define finish1220
+(define finish_2533
   (make-struct-type-install-properties
    '(syslog-log-receiver)
    2
@@ -32497,7 +32615,7 @@
    #f
    2
    0))
-(define effect_2288 (finish1220 struct:syslog-log-receiver))
+(define effect_2288 (finish_2533 struct:syslog-log-receiver))
 (define syslog-log-receiver4.1
   (|#%name|
    syslog-log-receiver
@@ -33418,7 +33536,7 @@
                       (void)))))))))
          (loop_0 logger_0))
         (void)))))
-(define finish1262
+(define finish_2904
   (make-struct-type-install-properties
    '(filesystem-change-evt)
    2
@@ -33464,7 +33582,7 @@
    #f
    2
    3))
-(define effect_3368 (finish1262 struct:fs-change-evt))
+(define effect_3368 (finish_2904 struct:fs-change-evt))
 (define fs-change-evt1.1
   (|#%name|
    fs-change-evt
@@ -33920,7 +34038,7 @@
                        (loop_0 start_0)))))
                 (let ((bstr_0 (make-bytes sz_0)))
                   (begin (|#%app| final_0 p_0 bstr_0) bstr_0))))))))))
-(define finish1274
+(define finish_2250
   (make-struct-type-install-properties
    '(subprocess)
    3
@@ -33963,7 +34081,7 @@
    #f
    3
    3))
-(define effect_2289 (finish1274 struct:subprocess))
+(define effect_2289 (finish_2250 struct:subprocess))
 (define make-subprocess
   (|#%name|
    make-subprocess
@@ -34109,11 +34227,11 @@
                 'subprocess
                 "(or/c (and/c output-port? file-stream-port?) #f 'stdout)"
                 stderr_0))
-             (let ((lr1281 unsafe-undefined)
+             (let ((lr1319 unsafe-undefined)
                    (group_0 unsafe-undefined)
                    (command_0 unsafe-undefined)
                    (exact/args_0 unsafe-undefined))
-               (set! lr1281
+               (set! lr1319
                  (call-with-values
                   (lambda ()
                     (if (path-string? group/command_0)
@@ -34168,9 +34286,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 lr1281 0))
-               (set! command_0 (unsafe-vector*-ref lr1281 1))
-               (set! exact/args_0 (unsafe-vector*-ref lr1281 2))
+               (set! group_0 (unsafe-vector*-ref lr1319 0))
+               (set! command_0 (unsafe-vector*-ref lr1319 1))
+               (set! exact/args_0 (unsafe-vector*-ref lr1319 2))
                (call-with-values
                 (lambda ()
                   (if (if (pair? exact/args_0)
@@ -34797,7 +34915,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 finish1313
+(define finish_2569
   (make-struct-type-install-properties
    '(tcp-input-port)
    1
@@ -34824,7 +34942,7 @@
    #f
    1
    1))
-(define effect_2486 (finish1313 struct:tcp-input-port))
+(define effect_2486 (finish_2569 struct:tcp-input-port))
 (define create-tcp-input-port
   (|#%name|
    create-tcp-input-port
@@ -34838,7 +34956,7 @@
   (|#%name|
    set-tcp-input-port-abandon?!
    (record-mutator struct:tcp-input-port 0)))
-(define finish1316
+(define finish_2584
   (make-struct-type-install-properties
    '(tcp-input-port-methods)
    0
@@ -34859,7 +34977,7 @@
    #f
    0
    0))
-(define effect_2506 (finish1316 struct:tcp-input-port-methods.1))
+(define effect_2506 (finish_2584 struct:tcp-input-port-methods.1))
 (define tcp-input-port-methods1.1
   (|#%name|
    tcp-input-port-methods
@@ -34935,11 +35053,11 @@
                                  0)))))
                          (|#%name|
                           raise-read-error
-                          (lambda (this-id_0 n50_0)
+                          (lambda (this-id_0 n51_0)
                             (begin
                               (raise-network-error
                                #f
-                               n50_0
+                               n51_0
                                "error reading from stream port")))))))))))))))))
 (define make-tcp-input-port.1
   (|#%name|
@@ -34951,7 +35069,7 @@
                 (box 1)
                 fd-refcount2_0)))
          (let ((app_0 (direct2.1 #f 0 0)))
-           (let ((temp80_0
+           (let ((temp82_0
                   (create-tcp-input-port
                    tcp-input-port-vtable.1
                    name5_0
@@ -34972,9 +35090,10 @@
                    fd4_0
                    fd-refcount_0
                    #f
+                   #f
                    #f)))
-             (finish-fd-input-port.1 unsafe-undefined temp80_0))))))))
-(define finish1330
+             (finish-fd-input-port.1 unsafe-undefined temp82_0))))))))
+(define finish_2197
   (make-struct-type-install-properties
    '(tcp-output-port)
    1
@@ -35001,7 +35120,7 @@
    #f
    1
    1))
-(define effect_2179 (finish1330 struct:tcp-output-port))
+(define effect_2179 (finish_2197 struct:tcp-output-port))
 (define create-tcp-output-port
   (|#%name|
    create-tcp-output-port
@@ -35017,7 +35136,7 @@
   (|#%name|
    set-tcp-output-port-abandon?!
    (record-mutator struct:tcp-output-port 0)))
-(define finish1333
+(define finish_2811
   (make-struct-type-install-properties
    '(tcp-output-port-methods)
    0
@@ -35038,7 +35157,7 @@
    #f
    0
    0))
-(define effect_2820 (finish1333 struct:tcp-output-port-methods.1))
+(define effect_2820 (finish_2811 struct:tcp-output-port-methods.1))
 (define tcp-output-port-methods7.1
   (|#%name|
    tcp-output-port-methods
@@ -35102,11 +35221,11 @@
                            1)))))
                    (|#%name|
                     raise-write-error
-                    (lambda (this-id_0 n109_0)
+                    (lambda (this-id_0 n111_0)
                       (begin
                         (raise-network-error
                          #f
-                         n109_0
+                         n111_0
                          "error writing to stream port"))))))))))))))
 (define make-tcp-output-port.1
   (|#%name|
@@ -35118,7 +35237,7 @@
                 (box 1)
                 fd-refcount8_0)))
          (let ((app_0 (direct2.1 #f 0 0)))
-           (let ((temp135_0
+           (let ((temp137_0
                   (create-tcp-output-port
                    tcp-output-port-vtable.1
                    name11_0
@@ -35140,7 +35259,7 @@
                    'block
                    #f
                    #f)))
-             (finish-fd-output-port.1 unsafe-undefined #f temp135_0))))))))
+             (finish-fd-output-port.1 unsafe-undefined #f temp137_0))))))))
 (define open-input-output-tcp.1
   (|#%name|
    open-input-output-tcp
@@ -35174,7 +35293,7 @@
            (if (tcp-output-port? cp_0)
              (begin (set-tcp-output-port-abandon?! cp_0 #t) (close-port p_0))
              (void))))))))
-(define finish1345
+(define finish_3040
   (make-struct-type-install-properties
    '(rktio-evt)
    2
@@ -35209,7 +35328,7 @@
    #f
    2
    0))
-(define effect_1868 (finish1345 struct:rktio-evt))
+(define effect_1868 (finish_3040 struct:rktio-evt))
 (define rktio-evt1.1
   (|#%name|
    rktio-evt
@@ -35365,7 +35484,7 @@
       (void))))
 (define address-init!
   (lambda () (unsafe-place-local-set! cell.1$3 (make-will-executor))))
-(define finish1351
+(define finish_3124
   (make-struct-type-install-properties
    '(connect-progress)
    2
@@ -35386,7 +35505,7 @@
    #f
    2
    3))
-(define effect_2319 (finish1351 struct:connect-progress))
+(define effect_2319 (finish_3124 struct:connect-progress))
 (define connect-progress1.1
   (|#%name|
    connect-progress
@@ -35738,7 +35857,7 @@
           (fd-semaphore-update! fd_0 'remove)
           (set-connect-progress-trying-fd! conn-prog_0 #f))
         (void)))))
-(define finish1356
+(define finish_2761
   (make-struct-type-install-properties
    '(tcp-listener)
    3
@@ -35762,7 +35881,7 @@
    #f
    3
    0))
-(define effect_2347 (finish1356 struct:tcp-listener))
+(define effect_2347 (finish_2761 struct:tcp-listener))
 (define tcp-listener1.1
   (|#%name|
    tcp-listener
@@ -36118,7 +36237,7 @@
            (void)
            (raise-argument-error 'tcp-accept-evt "tcp-listener?" listener_0))
          (accept-evt6.1 listener_0))))))
-(define finish1366
+(define finish_2736
   (make-struct-type-install-properties
    '(tcp-accept-evt)
    1
@@ -36206,7 +36325,7 @@
    #f
    1
    0))
-(define effect_2608 (finish1366 struct:accept-evt))
+(define effect_2608 (finish_2736 struct:accept-evt))
 (define accept-evt6.1
   (|#%name|
    accept-evt
@@ -36289,7 +36408,7 @@
                    v_0))))))
           (for-loop_0 0 0))))
       (args (raise-binding-result-arity-error 2 args))))))
-(define finish1371
+(define finish_2217
   (make-struct-type-install-properties
    '(udp)
    3
@@ -36303,7 +36422,7 @@
    'udp))
 (define struct:udp
   (make-record-type-descriptor* 'udp #f (|#%nongenerative-uid| udp) #f #f 3 7))
-(define effect_2743 (finish1371 struct:udp))
+(define effect_2743 (finish_2217 struct:udp))
 (define udp1.1
   (|#%name|
    udp
@@ -37447,7 +37566,7 @@
                     who59_0
                     u60_0)))))))
           (loop_0)))))))
-(define finish1387
+(define finish_2174
   (make-struct-type-install-properties
    '(udp-send-evt)
    2
@@ -37492,7 +37611,7 @@
    #f
    2
    0))
-(define effect_2114 (finish1387 struct:udp-sending-evt))
+(define effect_2114 (finish_2174 struct:udp-sending-evt))
 (define udp-sending-evt66.1
   (|#%name|
    udp-sending-evt
@@ -37504,7 +37623,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 finish1390
+(define finish_2617
   (make-struct-type-install-properties
    '(udp-send-ready-evt)
    0
@@ -37525,7 +37644,7 @@
    #f
    0
    0))
-(define effect_2524 (finish1390 struct:udp-sending-ready-evt))
+(define effect_2524 (finish_2617 struct:udp-sending-ready-evt))
 (define udp-sending-ready-evt67.1
   (|#%name|
    udp-sending-ready-evt
@@ -37836,7 +37955,7 @@
           (loop_0)))))))
 (define cell.1$2 (unsafe-make-place-local #vu8()))
 (define cell.2 (unsafe-make-place-local ""))
-(define finish1394
+(define finish_2188
   (make-struct-type-install-properties
    '(udp-receive-evt)
    2
@@ -37886,7 +38005,7 @@
    #f
    2
    0))
-(define effect_2638 (finish1394 struct:udp-receiving-evt))
+(define effect_2638 (finish_2188 struct:udp-receiving-evt))
 (define udp-receiving-evt39.1
   (|#%name|
    udp-receiving-evt
@@ -37898,7 +38017,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 finish1397
+(define finish_2856
   (make-struct-type-install-properties
    '(udp-receive-ready-evt)
    0
@@ -37919,7 +38038,7 @@
    #f
    0
    0))
-(define effect_2865 (finish1397 struct:udp-receiving-ready-evt))
+(define effect_2865 (finish_2856 struct:udp-receiving-ready-evt))
 (define udp-receiving-ready-evt40.1
   (|#%name|
    udp-receiving-ready-evt
diff --git a/racket/src/cs/schemified/known.scm b/racket/src/cs/schemified/known.scm
index 5cfa93a0ac..51cf6013c2 100644
--- a/racket/src/cs/schemified/known.scm
+++ b/racket/src/cs/schemified/known.scm
@@ -134,7 +134,19 @@
      (lambda (v_0) (|#%app| (|#%app| do-stream-ref v_0 1)))
      (lambda (v_0) (|#%app| (|#%app| do-stream-ref v_0 2))))))))
 (define empty-stream (make-do-stream (lambda () #t) void void))
-(define finish7
+(define print-value-columns
+  (make-parameter
+   +inf.0
+   (lambda (c_0)
+     (if (let ((or-part_0 (eqv? c_0 +inf.0)))
+           (if or-part_0 or-part_0 (if (exact-integer? c_0) (> c_0 5) #f)))
+       c_0
+       (raise-argument-error
+        'print-value-columns
+        "(or/c +inf.0 (and/c exact-integer? (>/c 5)))"
+        c_0)))
+   'print-value-columns))
+(define finish_2045
   (make-struct-type-install-properties
    '(known-constant)
    0
@@ -155,7 +167,7 @@
    #f
    0
    0))
-(define effect_2537 (finish7 struct:known-constant))
+(define effect_2537 (finish_2045 struct:known-constant))
 (define known-constant
   (|#%name|
    known-constant
@@ -173,7 +185,7 @@
         (if (impersonator? v)
           (known-constant?_2598 (impersonator-val v))
           #f))))))
-(define finish10
+(define finish_2081
   (make-struct-type-install-properties
    '(known-consistent)
    0
@@ -206,7 +218,7 @@
    #f
    0
    0))
-(define effect_2382 (finish10 struct:known-consistent))
+(define effect_2382 (finish_2081 struct:known-consistent))
 (define known-consistent
   (|#%name|
    known-consistent
@@ -224,7 +236,7 @@
         (if (impersonator? v)
           (known-consistent?_3048 (impersonator-val v))
           #f))))))
-(define finish13
+(define finish_2443
   (make-struct-type-install-properties
    '(known-authentic)
    0
@@ -257,7 +269,7 @@
    #f
    0
    0))
-(define effect_2570 (finish13 struct:known-authentic))
+(define effect_2570 (finish_2443 struct:known-authentic))
 (define known-authentic
   (|#%name|
    known-authentic
@@ -275,7 +287,7 @@
         (if (impersonator? v)
           (known-authentic?_3119 (impersonator-val v))
           #f))))))
-(define finish16
+(define finish_2536
   (make-struct-type-install-properties
    '(known-copy)
    1
@@ -308,7 +320,7 @@
    #f
    1
    1))
-(define effect_2542 (finish16 struct:known-copy))
+(define effect_2542 (finish_2536 struct:known-copy))
 (define known-copy
   (|#%name|
    known-copy
@@ -340,7 +352,7 @@
          s
          'known-copy
          'id))))))
-(define finish20
+(define finish_2861
   (make-struct-type-install-properties
    '(known-literal)
    1
@@ -373,7 +385,7 @@
    #f
    1
    1))
-(define effect_2788 (finish20 struct:known-literal))
+(define effect_2788 (finish_2861 struct:known-literal))
 (define known-literal
   (|#%name|
    known-literal
@@ -407,7 +419,7 @@
          s
          'known-literal
          'value))))))
-(define finish24
+(define finish_2897
   (make-struct-type-install-properties
    '(known-procedure)
    1
@@ -440,7 +452,7 @@
    #f
    1
    1))
-(define effect_2677 (finish24 struct:known-procedure))
+(define effect_2677 (finish_2897 struct:known-procedure))
 (define known-procedure
   (|#%name|
    known-procedure
@@ -476,7 +488,7 @@
          s
          'known-procedure
          'arity-mask))))))
-(define finish28
+(define finish_2542
   (make-struct-type-install-properties
    '(known-procedure/single-valued)
    0
@@ -509,7 +521,7 @@
    #f
    0
    0))
-(define effect_2532 (finish28 struct:known-procedure/single-valued))
+(define effect_2532 (finish_2542 struct:known-procedure/single-valued))
 (define known-procedure/single-valued
   (|#%name|
    known-procedure/single-valued
@@ -532,7 +544,7 @@
         (if (impersonator? v)
           (known-procedure/single-valued?_3105 (impersonator-val v))
           #f))))))
-(define finish31
+(define finish_2099
   (make-struct-type-install-properties
    '(known-procedure/no-prompt)
    0
@@ -565,7 +577,7 @@
    #f
    0
    0))
-(define effect_1771 (finish31 struct:known-procedure/no-prompt))
+(define effect_1771 (finish_2099 struct:known-procedure/no-prompt))
 (define known-procedure/no-prompt
   (|#%name|
    known-procedure/no-prompt
@@ -588,7 +600,7 @@
         (if (impersonator? v)
           (known-procedure/no-prompt?_2036 (impersonator-val v))
           #f))))))
-(define finish34
+(define finish_2719
   (make-struct-type-install-properties
    '(known-procedure/no-prompt/multi)
    0
@@ -621,7 +633,7 @@
    #f
    0
    0))
-(define effect_2793 (finish34 struct:known-procedure/no-prompt/multi))
+(define effect_2793 (finish_2719 struct:known-procedure/no-prompt/multi))
 (define known-procedure/no-prompt/multi
   (|#%name|
    known-procedure/no-prompt/multi
@@ -644,7 +656,7 @@
         (if (impersonator? v)
           (known-procedure/no-prompt/multi?_2394 (impersonator-val v))
           #f))))))
-(define finish37
+(define finish_2574
   (make-struct-type-install-properties
    '(known-procedure/no-return)
    0
@@ -677,7 +689,7 @@
    #f
    0
    0))
-(define effect_2517 (finish37 struct:known-procedure/no-return))
+(define effect_2517 (finish_2574 struct:known-procedure/no-return))
 (define known-procedure/no-return
   (|#%name|
    known-procedure/no-return
@@ -700,7 +712,7 @@
         (if (impersonator? v)
           (known-procedure/no-return?_1763 (impersonator-val v))
           #f))))))
-(define finish40
+(define finish_2550
   (make-struct-type-install-properties
    '(known-procedure/can-inline)
    1
@@ -733,7 +745,7 @@
    #f
    1
    1))
-(define effect_2308 (finish40 struct:known-procedure/can-inline))
+(define effect_2308 (finish_2550 struct:known-procedure/can-inline))
 (define known-procedure/can-inline
   (|#%name|
    known-procedure/can-inline
@@ -774,7 +786,7 @@
          s
          'known-procedure/can-inline
          'expr))))))
-(define finish44
+(define finish_1976
   (make-struct-type-install-properties
    '(known-procedure/can-inline/need-imports)
    1
@@ -807,7 +819,8 @@
    #f
    1
    1))
-(define effect_2618 (finish44 struct:known-procedure/can-inline/need-imports))
+(define effect_2618
+  (finish_1976 struct:known-procedure/can-inline/need-imports))
 (define known-procedure/can-inline/need-imports
   (|#%name|
    known-procedure/can-inline/need-imports
@@ -848,7 +861,7 @@
          s
          'known-procedure/can-inline/need-imports
          'needed))))))
-(define finish48
+(define finish_1734
   (make-struct-type-install-properties
    '(known-procedure/folding)
    0
@@ -881,7 +894,7 @@
    #f
    0
    0))
-(define effect_2478 (finish48 struct:known-procedure/folding))
+(define effect_2478 (finish_1734 struct:known-procedure/folding))
 (define known-procedure/folding
   (|#%name|
    known-procedure/folding
@@ -904,7 +917,7 @@
         (if (impersonator? v)
           (known-procedure/folding?_2882 (impersonator-val v))
           #f))))))
-(define finish51
+(define finish_2008
   (make-struct-type-install-properties
    '(known-procedure/folding/limited)
    1
@@ -937,7 +950,7 @@
    #f
    1
    1))
-(define effect_2518 (finish51 struct:known-procedure/folding/limited))
+(define effect_2518 (finish_2008 struct:known-procedure/folding/limited))
 (define known-procedure/folding/limited
   (|#%name|
    known-procedure/folding/limited
@@ -978,7 +991,7 @@
          s
          'known-procedure/folding/limited
          'kind))))))
-(define finish55
+(define finish_2826
   (make-struct-type-install-properties
    '(known-procedure/succeeds)
    0
@@ -1011,7 +1024,7 @@
    #f
    0
    0))
-(define effect_2467 (finish55 struct:known-procedure/succeeds))
+(define effect_2467 (finish_2826 struct:known-procedure/succeeds))
 (define known-procedure/succeeds
   (|#%name|
    known-procedure/succeeds
@@ -1034,7 +1047,7 @@
         (if (impersonator? v)
           (known-procedure/succeeds?_3041 (impersonator-val v))
           #f))))))
-(define finish58
+(define finish_2051
   (make-struct-type-install-properties
    '(known-procedure/allocates)
    0
@@ -1067,7 +1080,7 @@
    #f
    0
    0))
-(define effect_2336 (finish58 struct:known-procedure/allocates))
+(define effect_2336 (finish_2051 struct:known-procedure/allocates))
 (define known-procedure/allocates
   (|#%name|
    known-procedure/allocates
@@ -1090,7 +1103,7 @@
         (if (impersonator? v)
           (known-procedure/allocates?_2244 (impersonator-val v))
           #f))))))
-(define finish61
+(define finish_2724
   (make-struct-type-install-properties
    '(known-procedure/pure)
    0
@@ -1123,7 +1136,7 @@
    #f
    0
    0))
-(define effect_3058 (finish61 struct:known-procedure/pure))
+(define effect_3058 (finish_2724 struct:known-procedure/pure))
 (define known-procedure/pure
   (|#%name|
    known-procedure/pure
@@ -1143,7 +1156,7 @@
         (if (impersonator? v)
           (known-procedure/pure?_2240 (impersonator-val v))
           #f))))))
-(define finish64
+(define finish_2466
   (make-struct-type-install-properties
    '(known-procedure/pure/folding)
    0
@@ -1176,7 +1189,7 @@
    #f
    0
    0))
-(define effect_2264 (finish64 struct:known-procedure/pure/folding))
+(define effect_2264 (finish_2466 struct:known-procedure/pure/folding))
 (define known-procedure/pure/folding
   (|#%name|
    known-procedure/pure/folding
@@ -1199,7 +1212,7 @@
         (if (impersonator? v)
           (known-procedure/pure/folding?_2719 (impersonator-val v))
           #f))))))
-(define finish67
+(define finish_2978
   (make-struct-type-install-properties
    '(known-procedure/pure/folding-unsafe)
    1
@@ -1232,7 +1245,7 @@
    #f
    1
    1))
-(define effect_2657 (finish67 struct:known-procedure/pure/folding-unsafe))
+(define effect_2657 (finish_2978 struct:known-procedure/pure/folding-unsafe))
 (define known-procedure/pure/folding-unsafe
   (|#%name|
    known-procedure/pure/folding-unsafe
@@ -1273,7 +1286,7 @@
          s
          'known-procedure/pure/folding-unsafe
          'safe))))))
-(define finish71
+(define finish_3128
   (make-struct-type-install-properties
    '(known-procedure/has-unsafe)
    1
@@ -1306,7 +1319,7 @@
    #f
    1
    1))
-(define effect_1752 (finish71 struct:known-procedure/has-unsafe))
+(define effect_1752 (finish_3128 struct:known-procedure/has-unsafe))
 (define known-procedure/has-unsafe
   (|#%name|
    known-procedure/has-unsafe
@@ -1347,7 +1360,7 @@
          s
          'known-procedure/has-unsafe
          'alternate))))))
-(define finish75
+(define finish_2439
   (make-struct-type-install-properties
    '(known-procedure/has-unsafe/folding)
    0
@@ -1380,7 +1393,7 @@
    #f
    0
    0))
-(define effect_2489 (finish75 struct:known-procedure/has-unsafe/folding))
+(define effect_2489 (finish_2439 struct:known-procedure/has-unsafe/folding))
 (define known-procedure/has-unsafe/folding
   (|#%name|
    known-procedure/has-unsafe/folding
@@ -1403,7 +1416,7 @@
         (if (impersonator? v)
           (known-procedure/has-unsafe/folding?_2169 (impersonator-val v))
           #f))))))
-(define finish78
+(define finish_2602
   (make-struct-type-install-properties
    '(known-procedure/has-unsafe/folding/limited)
    1
@@ -1437,7 +1450,7 @@
    1
    1))
 (define effect_2512
-  (finish78 struct:known-procedure/has-unsafe/folding/limited))
+  (finish_2602 struct:known-procedure/has-unsafe/folding/limited))
 (define known-procedure/has-unsafe/folding/limited
   (|#%name|
    known-procedure/has-unsafe/folding/limited
@@ -1479,7 +1492,7 @@
          s
          'known-procedure/has-unsafe/folding/limited
          'kind))))))
-(define finish82
+(define finish_2844
   (make-struct-type-install-properties
    '(known-struct-type)
    4
@@ -1512,7 +1525,7 @@
    #f
    4
    15))
-(define effect_2667 (finish82 struct:known-struct-type))
+(define effect_2667 (finish_2844 struct:known-struct-type))
 (define known-struct-type
   (|#%name|
    known-struct-type
@@ -1602,7 +1615,7 @@
          s
          'known-struct-type
          'sealed?))))))
-(define finish89
+(define finish_2453
   (make-struct-type-install-properties
    '(known-constructor)
    1
@@ -1635,7 +1648,7 @@
    #f
    1
    1))
-(define effect_1913 (finish89 struct:known-constructor))
+(define effect_1913 (finish_2453 struct:known-constructor))
 (define known-constructor
   (|#%name|
    known-constructor
@@ -1671,7 +1684,7 @@
          s
          'known-constructor
          'type))))))
-(define finish93
+(define finish_2917
   (make-struct-type-install-properties
    '(known-predicate)
    1
@@ -1704,7 +1717,7 @@
    #f
    1
    1))
-(define effect_2144 (finish93 struct:known-predicate))
+(define effect_2144 (finish_2917 struct:known-predicate))
 (define known-predicate
   (|#%name|
    known-predicate
@@ -1738,7 +1751,7 @@
          s
          'known-predicate
          'type))))))
-(define finish97
+(define finish_2548
   (make-struct-type-install-properties
    '(known-accessor)
    1
@@ -1771,7 +1784,7 @@
    #f
    1
    1))
-(define effect_2905 (finish97 struct:known-accessor))
+(define effect_2905 (finish_2548 struct:known-accessor))
 (define known-accessor
   (|#%name|
    known-accessor
@@ -1805,7 +1818,7 @@
          s
          'known-accessor
          'type))))))
-(define finish101
+(define finish_2552
   (make-struct-type-install-properties
    '(known-mutator)
    1
@@ -1838,7 +1851,7 @@
    #f
    1
    1))
-(define effect_2521 (finish101 struct:known-mutator))
+(define effect_2521 (finish_2552 struct:known-mutator))
 (define known-mutator
   (|#%name|
    known-mutator
@@ -1872,7 +1885,7 @@
          s
          'known-mutator
          'type))))))
-(define finish105
+(define finish_2184
   (make-struct-type-install-properties
    '(known-struct-constructor)
    1
@@ -1905,7 +1918,7 @@
    #f
    1
    1))
-(define effect_3238 (finish105 struct:known-struct-constructor))
+(define effect_3238 (finish_2184 struct:known-struct-constructor))
 (define known-struct-constructor
   (|#%name|
    known-struct-constructor
@@ -1946,7 +1959,7 @@
          s
          'known-struct-constructor
          'type-id))))))
-(define finish109
+(define finish_2304
   (make-struct-type-install-properties
    '(known-struct-predicate)
    3
@@ -1979,7 +1992,7 @@
    #f
    3
    7))
-(define effect_2384 (finish109 struct:known-struct-predicate))
+(define effect_2384 (finish_2304 struct:known-struct-predicate))
 (define known-struct-predicate
   (|#%name|
    known-struct-predicate
@@ -2053,7 +2066,7 @@
          s
          'known-struct-predicate
          'sealed?))))))
-(define finish115
+(define finish_3014
   (make-struct-type-install-properties
    '(known-field-accessor)
    4
@@ -2086,7 +2099,7 @@
    #f
    4
    15))
-(define effect_2259 (finish115 struct:known-field-accessor))
+(define effect_2259 (finish_3014 struct:known-field-accessor))
 (define known-field-accessor
   (|#%name|
    known-field-accessor
@@ -2178,7 +2191,7 @@
          s
          'known-field-accessor
          'known-immutable?))))))
-(define finish122
+(define finish_2908
   (make-struct-type-install-properties
    '(known-field-mutator)
    3
@@ -2211,7 +2224,7 @@
    #f
    3
    7))
-(define effect_2603 (finish122 struct:known-field-mutator))
+(define effect_2603 (finish_2908 struct:known-field-mutator))
 (define known-field-mutator
   (|#%name|
    known-field-mutator
@@ -2285,7 +2298,7 @@
          s
          'known-field-mutator
          'pos))))))
-(define finish128
+(define finish_2543
   (make-struct-type-install-properties
    '(known-struct-constructor/need-imports)
    1
@@ -2318,7 +2331,7 @@
    #f
    1
    1))
-(define effect_2146 (finish128 struct:known-struct-constructor/need-imports))
+(define effect_2146 (finish_2543 struct:known-struct-constructor/need-imports))
 (define known-struct-constructor/need-imports
   (|#%name|
    known-struct-constructor/need-imports
@@ -2359,7 +2372,7 @@
          s
          'known-struct-constructor/need-imports
          'needed))))))
-(define finish132
+(define finish_2626
   (make-struct-type-install-properties
    '(known-struct-predicate/need-imports)
    1
@@ -2392,7 +2405,7 @@
    #f
    1
    1))
-(define effect_3156 (finish132 struct:known-struct-predicate/need-imports))
+(define effect_3156 (finish_2626 struct:known-struct-predicate/need-imports))
 (define known-struct-predicate/need-imports
   (|#%name|
    known-struct-predicate/need-imports
@@ -2433,7 +2446,7 @@
          s
          'known-struct-predicate/need-imports
          'needed))))))
-(define finish136
+(define finish_2444
   (make-struct-type-install-properties
    '(known-field-accessor/need-imports)
    1
@@ -2466,7 +2479,7 @@
    #f
    1
    1))
-(define effect_2513 (finish136 struct:known-field-accessor/need-imports))
+(define effect_2513 (finish_2444 struct:known-field-accessor/need-imports))
 (define known-field-accessor/need-imports
   (|#%name|
    known-field-accessor/need-imports
@@ -2507,7 +2520,7 @@
          s
          'known-field-accessor/need-imports
          'needed))))))
-(define finish140
+(define finish_2153
   (make-struct-type-install-properties
    '(known-field-mutator/need-imports)
    1
@@ -2540,7 +2553,7 @@
    #f
    1
    1))
-(define effect_2273 (finish140 struct:known-field-mutator/need-imports))
+(define effect_2273 (finish_2153 struct:known-field-mutator/need-imports))
 (define known-field-mutator/need-imports
   (|#%name|
    known-field-mutator/need-imports
@@ -2581,7 +2594,7 @@
          s
          'known-field-mutator/need-imports
          'needed))))))
-(define finish144
+(define finish_2492
   (make-struct-type-install-properties
    '(known-struct-type-property/immediate-guard)
    0
@@ -2609,7 +2622,7 @@
    0
    0))
 (define effect_2294
-  (finish144 struct:known-struct-type-property/immediate-guard))
+  (finish_2492 struct:known-struct-type-property/immediate-guard))
 (define known-struct-type-property/immediate-guard
   (|#%name|
    known-struct-type-property/immediate-guard
diff --git a/racket/src/cs/schemified/regexp.scm b/racket/src/cs/schemified/regexp.scm
index 7322b8af07..3de2522164 100644
--- a/racket/src/cs/schemified/regexp.scm
+++ b/racket/src/cs/schemified/regexp.scm
@@ -290,13 +290,13 @@
   (|#%name|
    check-range
    (lambda (a_0 b_0 step_0)
-     (begin
-       (begin
-         (if (real? a_0) (void) (raise-argument-error 'in-range "real?" a_0))
-         (if (real? b_0) (void) (raise-argument-error 'in-range "real?" b_0))
-         (if (real? step_0)
-           (void)
-           (raise-argument-error 'in-range "real?" step_0)))))))
+     (begin (check-range-generic 'in-range a_0 b_0 step_0)))))
+(define check-range-generic
+  (lambda (who_0 a_0 b_0 step_0)
+    (begin
+      (if (real? a_0) (void) (raise-argument-error who_0 "real?" a_0))
+      (if (real? b_0) (void) (raise-argument-error who_0 "real?" b_0))
+      (if (real? step_0) (void) (raise-argument-error who_0 "real?" step_0)))))
 (define check-naturals
   (lambda (n_0)
     (if (if (integer? n_0) (if (exact? n_0) (>= n_0 0) #f) #f)
@@ -687,6 +687,18 @@
                     (let ((or-part_0 (apply f_0 (map_1346 car ls_1))))
                       (if or-part_0 or-part_0 (loop_0 next-ls_0)))))))))))
        (loop_0 ls_0)))))
+(define print-value-columns
+  (make-parameter
+   +inf.0
+   (lambda (c_0)
+     (if (let ((or-part_0 (eqv? c_0 +inf.0)))
+           (if or-part_0 or-part_0 (if (exact-integer? c_0) (> c_0 5) #f)))
+       c_0
+       (raise-argument-error
+        'print-value-columns
+        "(or/c +inf.0 (and/c exact-integer? (>/c 5)))"
+        c_0)))
+   'print-value-columns))
 (define regexp-error-tag (make-continuation-prompt-tag 'regexp-error))
 (define regexp-error
   (lambda (fmt_0 . args_0)
@@ -865,7 +877,7 @@
 (define rx:line-end 'line-end)
 (define rx:word-boundary 'word-boundary)
 (define rx:not-word-boundary 'not-word-boundary)
-(define finish39
+(define finish_2542
   (make-struct-type-install-properties
    '(rx:alts)
    2
@@ -886,7 +898,7 @@
    #f
    2
    0))
-(define effect_2414 (finish39 struct:rx:alts))
+(define effect_2414 (finish_2542 struct:rx:alts))
 (define rx:alts1.1
   (|#%name|
    rx:alts
@@ -921,7 +933,7 @@
        (rx:alts-rx_2917 s)
        ($value
         (impersonate-ref rx:alts-rx_2917 struct:rx:alts 1 s 'rx:alts 'rx2))))))
-(define finish44
+(define finish_2732
   (make-struct-type-install-properties
    '(rx:sequence)
    2
@@ -942,7 +954,7 @@
    #f
    2
    0))
-(define effect_2459 (finish44 struct:rx:sequence))
+(define effect_2459 (finish_2732 struct:rx:sequence))
 (define rx:sequence2.1
   (|#%name|
    rx:sequence
@@ -992,7 +1004,7 @@
          s
          'rx:sequence
          'needs-backtrack?))))))
-(define finish49
+(define finish_2954
   (make-struct-type-install-properties
    '(rx:group)
    2
@@ -1013,7 +1025,7 @@
    #f
    2
    0))
-(define effect_1819 (finish49 struct:rx:group))
+(define effect_1819 (finish_2954 struct:rx:group))
 (define rx:group3.1
   (|#%name|
    rx:group
@@ -1060,7 +1072,7 @@
          s
          'rx:group
          'number))))))
-(define finish54
+(define finish_1837
   (make-struct-type-install-properties
    '(rx:repeat)
    4
@@ -1081,7 +1093,7 @@
    #f
    4
    0))
-(define effect_2312 (finish54 struct:rx:repeat))
+(define effect_2312 (finish_1837 struct:rx:repeat))
 (define rx:repeat4.1
   (|#%name|
    rx:repeat
@@ -1161,7 +1173,7 @@
          s
          'rx:repeat
          'non-greedy?))))))
-(define finish61
+(define finish_3260
   (make-struct-type-install-properties
    '(rx:maybe)
    2
@@ -1182,7 +1194,7 @@
    #f
    2
    0))
-(define effect_2202 (finish61 struct:rx:maybe))
+(define effect_2202 (finish_3260 struct:rx:maybe))
 (define rx:maybe5.1
   (|#%name|
    rx:maybe
@@ -1229,7 +1241,7 @@
          s
          'rx:maybe
          'non-greedy?))))))
-(define finish66
+(define finish_2500
   (make-struct-type-install-properties
    '(rx:conditional)
    6
@@ -1250,7 +1262,7 @@
    #f
    6
    0))
-(define effect_2905 (finish66 struct:rx:conditional))
+(define effect_2905 (finish_2500 struct:rx:conditional))
 (define rx:conditional6.1
   (|#%name|
    rx:conditional
@@ -1366,7 +1378,7 @@
          s
          'rx:conditional
          'needs-backtrack?))))))
-(define finish75
+(define finish_2488
   (make-struct-type-install-properties
    '(rx:lookahead)
    4
@@ -1387,7 +1399,7 @@
    #f
    4
    0))
-(define effect_2486 (finish75 struct:rx:lookahead))
+(define effect_2486 (finish_2488 struct:rx:lookahead))
 (define rx:lookahead7.1
   (|#%name|
    rx:lookahead
@@ -1469,7 +1481,7 @@
          s
          'rx:lookahead
          'num-n))))))
-(define finish82
+(define finish_3095
   (make-struct-type-install-properties
    '(rx:lookbehind)
    6
@@ -1490,7 +1502,7 @@
    #f
    6
    12))
-(define effect_2468 (finish82 struct:rx:lookbehind))
+(define effect_2468 (finish_3095 struct:rx:lookbehind))
 (define rx:lookbehind8.1
   (|#%name|
    rx:lookbehind
@@ -1640,7 +1652,7 @@
          v
          'rx:lookbehind
          'lb-max))))))
-(define finish93
+(define finish_2346
   (make-struct-type-install-properties
    '(rx:cut)
    4
@@ -1661,7 +1673,7 @@
    #f
    4
    0))
-(define effect_2158 (finish93 struct:rx:cut))
+(define effect_2158 (finish_2346 struct:rx:cut))
 (define rx:cut9.1
   (|#%name|
    rx:cut
@@ -1733,7 +1745,7 @@
          s
          'rx:cut
          'needs-backtrack?))))))
-(define finish100
+(define finish_1921
   (make-struct-type-install-properties
    '(rx:reference)
    2
@@ -1754,7 +1766,7 @@
    #f
    2
    0))
-(define effect_2306 (finish100 struct:rx:reference))
+(define effect_2306 (finish_1921 struct:rx:reference))
 (define rx:reference10.1
   (|#%name|
    rx:reference
@@ -1806,7 +1818,7 @@
          s
          'rx:reference
          'case-sensitive?))))))
-(define finish105
+(define finish_2471
   (make-struct-type-install-properties
    '(rx:range)
    1
@@ -1827,7 +1839,7 @@
    #f
    1
    0))
-(define effect_2071 (finish105 struct:rx:range))
+(define effect_2071 (finish_2471 struct:rx:range))
 (define rx:range11.1
   (|#%name|
    rx:range
@@ -1858,7 +1870,7 @@
          s
          'rx:range
          'range))))))
-(define finish109
+(define finish_2339
   (make-struct-type-install-properties
    '(rx:unicode-categories)
    2
@@ -1879,7 +1891,7 @@
    #f
    2
    0))
-(define effect_2341 (finish109 struct:rx:unicode-categories))
+(define effect_2341 (finish_2339 struct:rx:unicode-categories))
 (define rx:unicode-categories12.1
   (|#%name|
    rx:unicode-categories
@@ -2129,7 +2141,7 @@
      num-n_0
      (let ((or-part_0 (needs-backtrack? pces1_0)))
        (if or-part_0 or-part_0 (needs-backtrack? pces2_0))))))
-(define finish123
+(define finish_2581
   (make-struct-type-install-properties
    '(parse-config)
    7
@@ -2150,7 +2162,7 @@
    #f
    7
    0))
-(define effect_2622 (finish123 struct:parse-config))
+(define effect_2622 (finish_2581 struct:parse-config))
 (define parse-config1.1
   (|#%name|
    parse-config
@@ -4697,7 +4709,7 @@
                                       (zero-sized? (rx:cut-rx rx_0))
                                       #f)))))))))))))))))))
 (define union (lambda (a_0 b_0) (if a_0 (if b_0 (range-union a_0 b_0) #f) #f)))
-(define finish535
+(define finish_2590
   (make-struct-type-install-properties
    '(lazy-bytes)
    13
@@ -4718,7 +4730,7 @@
    #f
    13
    3075))
-(define effect_2741 (finish535 struct:lazy-bytes))
+(define effect_2741 (finish_2590 struct:lazy-bytes))
 (define lazy-bytes1.1
   (|#%name|
    lazy-bytes
@@ -7242,7 +7254,7 @@
           (if (rx:range? rx_0)
             (range-matcher* (compile-range (rx:range-range rx_0)) max_0)
             #f))))))
-(define finish621
+(define finish_2797
   (make-struct-type-install-properties
    '(regexp)
    10
@@ -7280,7 +7292,7 @@
    #f
    10
    0))
-(define effect_2726 (finish621 struct:rx:regexp))
+(define effect_2726 (finish_2797 struct:rx:regexp))
 (define rx:regexp1.1
   (|#%name|
    rx:regexp
diff --git a/racket/src/cs/schemified/schemify.scm b/racket/src/cs/schemified/schemify.scm
index fd8ce91c05..9616a4142b 100644
--- a/racket/src/cs/schemified/schemify.scm
+++ b/racket/src/cs/schemified/schemify.scm
@@ -1583,13 +1583,13 @@
         (let ((app_1 (|#%app| range-ref v_0 0)))
           (values values #f app_0 app_1 (|#%app| range-ref v_0 2) #f #f))))))))
 (define check-range
-  (lambda (a_0 b_0 step_0)
+  (lambda (a_0 b_0 step_0) (check-range-generic 'in-range a_0 b_0 step_0)))
+(define check-range-generic
+  (lambda (who_0 a_0 b_0 step_0)
     (begin
-      (if (real? a_0) (void) (raise-argument-error 'in-range "real?" a_0))
-      (if (real? b_0) (void) (raise-argument-error 'in-range "real?" b_0))
-      (if (real? step_0)
-        (void)
-        (raise-argument-error 'in-range "real?" step_0)))))
+      (if (real? a_0) (void) (raise-argument-error who_0 "real?" a_0))
+      (if (real? b_0) (void) (raise-argument-error who_0 "real?" b_0))
+      (if (real? step_0) (void) (raise-argument-error who_0 "real?" step_0)))))
 (define check-naturals
   (lambda (n_0)
     (if (if (integer? n_0) (if (exact? n_0) (>= n_0 0) #f) #f)
@@ -1780,6 +1780,18 @@
             (check-not-unsafe-undefined sort 'sort)
             lst5_0
             less?6_0)))))))
+(define print-value-columns
+  (make-parameter
+   +inf.0
+   (lambda (c_0)
+     (if (let ((or-part_0 (eqv? c_0 +inf.0)))
+           (if or-part_0 or-part_0 (if (exact-integer? c_0) (> c_0 5) #f)))
+       c_0
+       (raise-argument-error
+        'print-value-columns
+        "(or/c +inf.0 (and/c exact-integer? (>/c 5)))"
+        c_0)))
+   'print-value-columns))
 (define correlated?$1 syntax?)
 (define correlated-e$1 syntax-e)
 (define correlated-property$1 syntax-property)
@@ -1850,7 +1862,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 finish48
+(define finish_2045
   (make-struct-type-install-properties
    '(known-constant)
    0
@@ -1871,7 +1883,7 @@
    #f
    0
    0))
-(define effect_2537 (finish48 struct:known-constant))
+(define effect_2537 (finish_2045 struct:known-constant))
 (define known-constant
   (|#%name|
    known-constant
@@ -1889,7 +1901,7 @@
         (if (impersonator? v)
           (known-constant?_2598 (impersonator-val v))
           #f))))))
-(define finish51
+(define finish_2081
   (make-struct-type-install-properties
    '(known-consistent)
    0
@@ -1922,7 +1934,7 @@
    #f
    0
    0))
-(define effect_2382 (finish51 struct:known-consistent))
+(define effect_2382 (finish_2081 struct:known-consistent))
 (define known-consistent
   (|#%name|
    known-consistent
@@ -1940,7 +1952,7 @@
         (if (impersonator? v)
           (known-consistent?_3048 (impersonator-val v))
           #f))))))
-(define finish54
+(define finish_2443
   (make-struct-type-install-properties
    '(known-authentic)
    0
@@ -1973,7 +1985,7 @@
    #f
    0
    0))
-(define effect_2570 (finish54 struct:known-authentic))
+(define effect_2570 (finish_2443 struct:known-authentic))
 (define known-authentic
   (|#%name|
    known-authentic
@@ -1991,7 +2003,7 @@
         (if (impersonator? v)
           (known-authentic?_3119 (impersonator-val v))
           #f))))))
-(define finish57
+(define finish_2536
   (make-struct-type-install-properties
    '(known-copy)
    1
@@ -2024,7 +2036,7 @@
    #f
    1
    1))
-(define effect_2542 (finish57 struct:known-copy))
+(define effect_2542 (finish_2536 struct:known-copy))
 (define known-copy
   (|#%name|
    known-copy
@@ -2056,7 +2068,7 @@
          s
          'known-copy
          'id))))))
-(define finish61
+(define finish_2861
   (make-struct-type-install-properties
    '(known-literal)
    1
@@ -2089,7 +2101,7 @@
    #f
    1
    1))
-(define effect_2788 (finish61 struct:known-literal))
+(define effect_2788 (finish_2861 struct:known-literal))
 (define known-literal
   (|#%name|
    known-literal
@@ -2123,7 +2135,7 @@
          s
          'known-literal
          'value))))))
-(define finish65
+(define finish_2897
   (make-struct-type-install-properties
    '(known-procedure)
    1
@@ -2156,7 +2168,7 @@
    #f
    1
    1))
-(define effect_2677 (finish65 struct:known-procedure))
+(define effect_2677 (finish_2897 struct:known-procedure))
 (define known-procedure
   (|#%name|
    known-procedure
@@ -2192,7 +2204,7 @@
          s
          'known-procedure
          'arity-mask))))))
-(define finish69
+(define finish_2542
   (make-struct-type-install-properties
    '(known-procedure/single-valued)
    0
@@ -2225,7 +2237,7 @@
    #f
    0
    0))
-(define effect_2532 (finish69 struct:known-procedure/single-valued))
+(define effect_2532 (finish_2542 struct:known-procedure/single-valued))
 (define known-procedure/single-valued
   (|#%name|
    known-procedure/single-valued
@@ -2248,7 +2260,7 @@
         (if (impersonator? v)
           (known-procedure/single-valued?_3105 (impersonator-val v))
           #f))))))
-(define finish72
+(define finish_2099
   (make-struct-type-install-properties
    '(known-procedure/no-prompt)
    0
@@ -2281,7 +2293,7 @@
    #f
    0
    0))
-(define effect_1771 (finish72 struct:known-procedure/no-prompt))
+(define effect_1771 (finish_2099 struct:known-procedure/no-prompt))
 (define known-procedure/no-prompt
   (|#%name|
    known-procedure/no-prompt
@@ -2304,7 +2316,7 @@
         (if (impersonator? v)
           (known-procedure/no-prompt?_2036 (impersonator-val v))
           #f))))))
-(define finish75
+(define finish_2719
   (make-struct-type-install-properties
    '(known-procedure/no-prompt/multi)
    0
@@ -2337,7 +2349,7 @@
    #f
    0
    0))
-(define effect_2793 (finish75 struct:known-procedure/no-prompt/multi))
+(define effect_2793 (finish_2719 struct:known-procedure/no-prompt/multi))
 (define known-procedure/no-prompt/multi
   (|#%name|
    known-procedure/no-prompt/multi
@@ -2360,7 +2372,7 @@
         (if (impersonator? v)
           (known-procedure/no-prompt/multi?_2394 (impersonator-val v))
           #f))))))
-(define finish78
+(define finish_2574
   (make-struct-type-install-properties
    '(known-procedure/no-return)
    0
@@ -2393,7 +2405,7 @@
    #f
    0
    0))
-(define effect_2517 (finish78 struct:known-procedure/no-return))
+(define effect_2517 (finish_2574 struct:known-procedure/no-return))
 (define known-procedure/no-return
   (|#%name|
    known-procedure/no-return
@@ -2416,7 +2428,7 @@
         (if (impersonator? v)
           (known-procedure/no-return?_1763 (impersonator-val v))
           #f))))))
-(define finish81
+(define finish_2550
   (make-struct-type-install-properties
    '(known-procedure/can-inline)
    1
@@ -2449,7 +2461,7 @@
    #f
    1
    1))
-(define effect_2308 (finish81 struct:known-procedure/can-inline))
+(define effect_2308 (finish_2550 struct:known-procedure/can-inline))
 (define known-procedure/can-inline
   (|#%name|
    known-procedure/can-inline
@@ -2490,7 +2502,7 @@
          s
          'known-procedure/can-inline
          'expr))))))
-(define finish85
+(define finish_1976
   (make-struct-type-install-properties
    '(known-procedure/can-inline/need-imports)
    1
@@ -2523,7 +2535,8 @@
    #f
    1
    1))
-(define effect_2618 (finish85 struct:known-procedure/can-inline/need-imports))
+(define effect_2618
+  (finish_1976 struct:known-procedure/can-inline/need-imports))
 (define known-procedure/can-inline/need-imports
   (|#%name|
    known-procedure/can-inline/need-imports
@@ -2564,7 +2577,7 @@
          s
          'known-procedure/can-inline/need-imports
          'needed))))))
-(define finish89
+(define finish_1734
   (make-struct-type-install-properties
    '(known-procedure/folding)
    0
@@ -2597,7 +2610,7 @@
    #f
    0
    0))
-(define effect_2478 (finish89 struct:known-procedure/folding))
+(define effect_2478 (finish_1734 struct:known-procedure/folding))
 (define known-procedure/folding
   (|#%name|
    known-procedure/folding
@@ -2620,7 +2633,7 @@
         (if (impersonator? v)
           (known-procedure/folding?_2882 (impersonator-val v))
           #f))))))
-(define finish92
+(define finish_2008
   (make-struct-type-install-properties
    '(known-procedure/folding/limited)
    1
@@ -2653,7 +2666,7 @@
    #f
    1
    1))
-(define effect_2518 (finish92 struct:known-procedure/folding/limited))
+(define effect_2518 (finish_2008 struct:known-procedure/folding/limited))
 (define known-procedure/folding/limited
   (|#%name|
    known-procedure/folding/limited
@@ -2694,7 +2707,7 @@
          s
          'known-procedure/folding/limited
          'kind))))))
-(define finish96
+(define finish_2826
   (make-struct-type-install-properties
    '(known-procedure/succeeds)
    0
@@ -2727,7 +2740,7 @@
    #f
    0
    0))
-(define effect_2467 (finish96 struct:known-procedure/succeeds))
+(define effect_2467 (finish_2826 struct:known-procedure/succeeds))
 (define known-procedure/succeeds
   (|#%name|
    known-procedure/succeeds
@@ -2750,7 +2763,7 @@
         (if (impersonator? v)
           (known-procedure/succeeds?_3041 (impersonator-val v))
           #f))))))
-(define finish99
+(define finish_2051
   (make-struct-type-install-properties
    '(known-procedure/allocates)
    0
@@ -2783,7 +2796,7 @@
    #f
    0
    0))
-(define effect_2336 (finish99 struct:known-procedure/allocates))
+(define effect_2336 (finish_2051 struct:known-procedure/allocates))
 (define known-procedure/allocates
   (|#%name|
    known-procedure/allocates
@@ -2806,7 +2819,7 @@
         (if (impersonator? v)
           (known-procedure/allocates?_2244 (impersonator-val v))
           #f))))))
-(define finish102
+(define finish_2724
   (make-struct-type-install-properties
    '(known-procedure/pure)
    0
@@ -2839,7 +2852,7 @@
    #f
    0
    0))
-(define effect_3058 (finish102 struct:known-procedure/pure))
+(define effect_3058 (finish_2724 struct:known-procedure/pure))
 (define known-procedure/pure
   (|#%name|
    known-procedure/pure
@@ -2859,7 +2872,7 @@
         (if (impersonator? v)
           (known-procedure/pure?_2240 (impersonator-val v))
           #f))))))
-(define finish105
+(define finish_2466
   (make-struct-type-install-properties
    '(known-procedure/pure/folding)
    0
@@ -2892,7 +2905,7 @@
    #f
    0
    0))
-(define effect_2264 (finish105 struct:known-procedure/pure/folding))
+(define effect_2264 (finish_2466 struct:known-procedure/pure/folding))
 (define known-procedure/pure/folding
   (|#%name|
    known-procedure/pure/folding
@@ -2915,7 +2928,7 @@
         (if (impersonator? v)
           (known-procedure/pure/folding?_2719 (impersonator-val v))
           #f))))))
-(define finish108
+(define finish_2978
   (make-struct-type-install-properties
    '(known-procedure/pure/folding-unsafe)
    1
@@ -2948,7 +2961,7 @@
    #f
    1
    1))
-(define effect_2657 (finish108 struct:known-procedure/pure/folding-unsafe))
+(define effect_2657 (finish_2978 struct:known-procedure/pure/folding-unsafe))
 (define known-procedure/pure/folding-unsafe
   (|#%name|
    known-procedure/pure/folding-unsafe
@@ -2989,7 +3002,7 @@
          s
          'known-procedure/pure/folding-unsafe
          'safe))))))
-(define finish112
+(define finish_3128
   (make-struct-type-install-properties
    '(known-procedure/has-unsafe)
    1
@@ -3022,7 +3035,7 @@
    #f
    1
    1))
-(define effect_1752 (finish112 struct:known-procedure/has-unsafe))
+(define effect_1752 (finish_3128 struct:known-procedure/has-unsafe))
 (define known-procedure/has-unsafe
   (|#%name|
    known-procedure/has-unsafe
@@ -3063,7 +3076,7 @@
          s
          'known-procedure/has-unsafe
          'alternate))))))
-(define finish116
+(define finish_2439
   (make-struct-type-install-properties
    '(known-procedure/has-unsafe/folding)
    0
@@ -3096,7 +3109,7 @@
    #f
    0
    0))
-(define effect_2489 (finish116 struct:known-procedure/has-unsafe/folding))
+(define effect_2489 (finish_2439 struct:known-procedure/has-unsafe/folding))
 (define known-procedure/has-unsafe/folding
   (|#%name|
    known-procedure/has-unsafe/folding
@@ -3119,7 +3132,7 @@
         (if (impersonator? v)
           (known-procedure/has-unsafe/folding?_2169 (impersonator-val v))
           #f))))))
-(define finish119
+(define finish_2602
   (make-struct-type-install-properties
    '(known-procedure/has-unsafe/folding/limited)
    1
@@ -3153,7 +3166,7 @@
    1
    1))
 (define effect_2512
-  (finish119 struct:known-procedure/has-unsafe/folding/limited))
+  (finish_2602 struct:known-procedure/has-unsafe/folding/limited))
 (define known-procedure/has-unsafe/folding/limited
   (|#%name|
    known-procedure/has-unsafe/folding/limited
@@ -3195,7 +3208,7 @@
          s
          'known-procedure/has-unsafe/folding/limited
          'kind))))))
-(define finish123
+(define finish_2844
   (make-struct-type-install-properties
    '(known-struct-type)
    4
@@ -3228,7 +3241,7 @@
    #f
    4
    15))
-(define effect_2667 (finish123 struct:known-struct-type))
+(define effect_2667 (finish_2844 struct:known-struct-type))
 (define known-struct-type
   (|#%name|
    known-struct-type
@@ -3318,7 +3331,7 @@
          s
          'known-struct-type
          'sealed?))))))
-(define finish130
+(define finish_2453
   (make-struct-type-install-properties
    '(known-constructor)
    1
@@ -3351,7 +3364,7 @@
    #f
    1
    1))
-(define effect_1913 (finish130 struct:known-constructor))
+(define effect_1913 (finish_2453 struct:known-constructor))
 (define known-constructor
   (|#%name|
    known-constructor
@@ -3387,7 +3400,7 @@
          s
          'known-constructor
          'type))))))
-(define finish134
+(define finish_2917
   (make-struct-type-install-properties
    '(known-predicate)
    1
@@ -3420,7 +3433,7 @@
    #f
    1
    1))
-(define effect_2144 (finish134 struct:known-predicate))
+(define effect_2144 (finish_2917 struct:known-predicate))
 (define known-predicate
   (|#%name|
    known-predicate
@@ -3454,7 +3467,7 @@
          s
          'known-predicate
          'type))))))
-(define finish138
+(define finish_2548
   (make-struct-type-install-properties
    '(known-accessor)
    1
@@ -3487,7 +3500,7 @@
    #f
    1
    1))
-(define effect_2905 (finish138 struct:known-accessor))
+(define effect_2905 (finish_2548 struct:known-accessor))
 (define known-accessor
   (|#%name|
    known-accessor
@@ -3521,7 +3534,7 @@
          s
          'known-accessor
          'type))))))
-(define finish142
+(define finish_2552
   (make-struct-type-install-properties
    '(known-mutator)
    1
@@ -3554,7 +3567,7 @@
    #f
    1
    1))
-(define effect_2521 (finish142 struct:known-mutator))
+(define effect_2521 (finish_2552 struct:known-mutator))
 (define known-mutator
   (|#%name|
    known-mutator
@@ -3588,7 +3601,7 @@
          s
          'known-mutator
          'type))))))
-(define finish146
+(define finish_2184
   (make-struct-type-install-properties
    '(known-struct-constructor)
    1
@@ -3621,7 +3634,7 @@
    #f
    1
    1))
-(define effect_3238 (finish146 struct:known-struct-constructor))
+(define effect_3238 (finish_2184 struct:known-struct-constructor))
 (define known-struct-constructor
   (|#%name|
    known-struct-constructor
@@ -3662,7 +3675,7 @@
          s
          'known-struct-constructor
          'type-id))))))
-(define finish150
+(define finish_2304
   (make-struct-type-install-properties
    '(known-struct-predicate)
    3
@@ -3695,7 +3708,7 @@
    #f
    3
    7))
-(define effect_2384 (finish150 struct:known-struct-predicate))
+(define effect_2384 (finish_2304 struct:known-struct-predicate))
 (define known-struct-predicate
   (|#%name|
    known-struct-predicate
@@ -3769,7 +3782,7 @@
          s
          'known-struct-predicate
          'sealed?))))))
-(define finish156
+(define finish_3014
   (make-struct-type-install-properties
    '(known-field-accessor)
    4
@@ -3802,7 +3815,7 @@
    #f
    4
    15))
-(define effect_2259 (finish156 struct:known-field-accessor))
+(define effect_2259 (finish_3014 struct:known-field-accessor))
 (define known-field-accessor
   (|#%name|
    known-field-accessor
@@ -3894,7 +3907,7 @@
          s
          'known-field-accessor
          'known-immutable?))))))
-(define finish163
+(define finish_2908
   (make-struct-type-install-properties
    '(known-field-mutator)
    3
@@ -3927,7 +3940,7 @@
    #f
    3
    7))
-(define effect_2603 (finish163 struct:known-field-mutator))
+(define effect_2603 (finish_2908 struct:known-field-mutator))
 (define known-field-mutator
   (|#%name|
    known-field-mutator
@@ -4001,7 +4014,7 @@
          s
          'known-field-mutator
          'pos))))))
-(define finish169
+(define finish_2543
   (make-struct-type-install-properties
    '(known-struct-constructor/need-imports)
    1
@@ -4034,7 +4047,7 @@
    #f
    1
    1))
-(define effect_2146 (finish169 struct:known-struct-constructor/need-imports))
+(define effect_2146 (finish_2543 struct:known-struct-constructor/need-imports))
 (define known-struct-constructor/need-imports
   (|#%name|
    known-struct-constructor/need-imports
@@ -4075,7 +4088,7 @@
          s
          'known-struct-constructor/need-imports
          'needed))))))
-(define finish173
+(define finish_2626
   (make-struct-type-install-properties
    '(known-struct-predicate/need-imports)
    1
@@ -4108,7 +4121,7 @@
    #f
    1
    1))
-(define effect_3156 (finish173 struct:known-struct-predicate/need-imports))
+(define effect_3156 (finish_2626 struct:known-struct-predicate/need-imports))
 (define known-struct-predicate/need-imports
   (|#%name|
    known-struct-predicate/need-imports
@@ -4149,7 +4162,7 @@
          s
          'known-struct-predicate/need-imports
          'needed))))))
-(define finish177
+(define finish_2444
   (make-struct-type-install-properties
    '(known-field-accessor/need-imports)
    1
@@ -4182,7 +4195,7 @@
    #f
    1
    1))
-(define effect_2513 (finish177 struct:known-field-accessor/need-imports))
+(define effect_2513 (finish_2444 struct:known-field-accessor/need-imports))
 (define known-field-accessor/need-imports
   (|#%name|
    known-field-accessor/need-imports
@@ -4223,7 +4236,7 @@
          s
          'known-field-accessor/need-imports
          'needed))))))
-(define finish181
+(define finish_2153
   (make-struct-type-install-properties
    '(known-field-mutator/need-imports)
    1
@@ -4256,7 +4269,7 @@
    #f
    1
    1))
-(define effect_2273 (finish181 struct:known-field-mutator/need-imports))
+(define effect_2273 (finish_2153 struct:known-field-mutator/need-imports))
 (define known-field-mutator/need-imports
   (|#%name|
    known-field-mutator/need-imports
@@ -4297,7 +4310,7 @@
          s
          'known-field-mutator/need-imports
          'needed))))))
-(define finish185
+(define finish_2492
   (make-struct-type-install-properties
    '(known-struct-type-property/immediate-guard)
    0
@@ -4325,7 +4338,7 @@
    0
    0))
 (define effect_2294
-  (finish185 struct:known-struct-type-property/immediate-guard))
+  (finish_2492 struct:known-struct-type-property/immediate-guard))
 (define known-struct-type-property/immediate-guard
   (|#%name|
    known-struct-type-property/immediate-guard
@@ -4366,7 +4379,7 @@
          (let ((app_0
                 (if (string? prefix_0) prefix_0 (symbol->string prefix_0))))
            (string-append app_0 (number->string (unbox b_0)))))))))
-(define finish189
+(define finish_2816
   (make-struct-type-install-properties
    '(import)
    4
@@ -4387,7 +4400,7 @@
    #f
    4
    0))
-(define effect_2192 (finish189 struct:import))
+(define effect_2192 (finish_2816 struct:import))
 (define import1.1
   (|#%name|
    import
@@ -4453,7 +4466,7 @@
          s
          'import
          'ext-id))))))
-(define finish196
+(define finish_1986
   (make-struct-type-install-properties
    '(import-group)
    6
@@ -4474,7 +4487,7 @@
    #f
    6
    60))
-(define effect_2739 (finish196 struct:import-group))
+(define effect_2739 (finish_1986 struct:import-group))
 (define import-group2.1
   (|#%name|
    import-group
@@ -4823,7 +4836,7 @@
             (|#%app| inc-index!_0)
             (|#%app| add-group!_0 grp_0)
             grp_0))))))
-(define finish210
+(define finish_2351
   (make-struct-type-install-properties
    '(export)
    2
@@ -4844,7 +4857,7 @@
    #f
    2
    0))
-(define effect_2782 (finish210 struct:export))
+(define effect_2782 (finish_2351 struct:export))
 (define export1.1
   (|#%name|
    export
@@ -4884,7 +4897,7 @@
          s
          'export
          'ext-id))))))
-(define finish215
+(define finish_2682
   (make-struct-type-install-properties
    '(too-early)
    2
@@ -4905,7 +4918,7 @@
    #f
    2
    0))
-(define effect_2833 (finish215 struct:too-early))
+(define effect_2833 (finish_2682 struct:too-early))
 (define too-early1.1
   (|#%name|
    too-early
@@ -7193,7 +7206,7 @@
      (case-lambda
       ((k_0 im_0) k_0)
       (args (raise-binding-result-arity-error 2 args))))))
-(define finish303
+(define finish_2858
   (make-struct-type-install-properties
    '(struct-type-info)
    11
@@ -7214,7 +7227,7 @@
    #f
    11
    0))
-(define effect_2037 (finish303 struct:struct-type-info))
+(define effect_2037 (finish_2858 struct:struct-type-info))
 (define struct-type-info1.1
   (|#%name|
    struct-type-info
@@ -30642,7 +30655,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 finish1668
+(define finish_2118
   (make-struct-type-install-properties
    '(convert-mode)
    4
@@ -30663,7 +30676,7 @@
    #f
    4
    0))
-(define effect_2443 (finish1668 struct:convert-mode))
+(define effect_2443 (finish_2118 struct:convert-mode))
 (define convert-mode1.1
   (|#%name|
    convert-mode
@@ -39786,7 +39799,7 @@
                         (if (|#%app| need-exposed?_0 q_0)
                           #t
                           (if (extflonum? q_0) #t #f))))))))))))))
-(define finish2138
+(define finish_3138
   (make-struct-type-install-properties
    '(to-unfasl)
    3
@@ -39807,7 +39820,7 @@
    #f
    3
    0))
-(define effect_2898 (finish2138 struct:to-unfasl))
+(define effect_2898 (finish_3138 struct:to-unfasl))
 (define to-unfasl1.1
   (|#%name|
    to-unfasl
@@ -39937,7 +39950,7 @@
      'write
      "cannot marshal value that is embedded in compiled code\n  value: ~v"
      v_0)))
-(define finish2146
+(define finish_2779
   (make-struct-type-install-properties
    '(node)
    5
@@ -39958,7 +39971,7 @@
    #f
    5
    0))
-(define effect_2547 (finish2146 struct:node))
+(define effect_2547 (finish_2779 struct:node))
 (define node1.1
   (|#%name|
    node
@@ -40259,7 +40272,7 @@
                          app_2
                          (stack-set stack_1 pos_1 (car vals_1))))))))))))
          (loop_0 pos_0 vals_0 count_0 stack_0))))))
-(define finish2192
+(define finish_2471
   (make-struct-type-install-properties
    '(stack-info)
    5
@@ -40280,7 +40293,7 @@
    #f
    5
    28))
-(define effect_2334 (finish2192 struct:stack-info))
+(define effect_2334 (finish_2471 struct:stack-info))
 (define stack-info4.1
   (|#%name|
    stack-info
@@ -40617,7 +40630,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 finish2206
+(define finish_2360
   (make-struct-type-install-properties
    '(indirect)
    2
@@ -40638,7 +40651,7 @@
    #f
    2
    0))
-(define effect_2125 (finish2206 struct:indirect))
+(define effect_2125 (finish_2360 struct:indirect))
 (define indirect1.1
   (|#%name|
    indirect
@@ -40685,7 +40698,7 @@
          s
          'indirect
          'element))))))
-(define finish2211
+(define finish_2373
   (make-struct-type-install-properties
    '(boxed)
    1
@@ -40706,7 +40719,7 @@
    #f
    1
    0))
-(define effect_2970 (finish2211 struct:boxed))
+(define effect_2970 (finish_2373 struct:boxed))
 (define boxed2.1
   (|#%name|
    boxed
@@ -40730,7 +40743,7 @@
        (boxed-pos_2515 s)
        ($value
         (impersonate-ref boxed-pos_2515 struct:boxed 0 s 'boxed 'pos))))))
-(define finish2215
+(define finish_2767
   (make-struct-type-install-properties
    '(boxed/check)
    0
@@ -40751,7 +40764,7 @@
    #f
    0
    0))
-(define effect_2937 (finish2215 struct:boxed/check))
+(define effect_2937 (finish_2767 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 e083891bf1..b103888d33 100644
--- a/racket/src/cs/schemified/thread.scm
+++ b/racket/src/cs/schemified/thread.scm
@@ -363,13 +363,13 @@
         (let ((app_1 (|#%app| range-ref v_0 0)))
           (values values #f app_0 app_1 (|#%app| range-ref v_0 2) #f #f))))))))
 (define check-range
-  (lambda (a_0 b_0 step_0)
+  (lambda (a_0 b_0 step_0) (check-range-generic 'in-range a_0 b_0 step_0)))
+(define check-range-generic
+  (lambda (who_0 a_0 b_0 step_0)
     (begin
-      (if (real? a_0) (void) (raise-argument-error 'in-range "real?" a_0))
-      (if (real? b_0) (void) (raise-argument-error 'in-range "real?" b_0))
-      (if (real? step_0)
-        (void)
-        (raise-argument-error 'in-range "real?" step_0)))))
+      (if (real? a_0) (void) (raise-argument-error who_0 "real?" a_0))
+      (if (real? b_0) (void) (raise-argument-error who_0 "real?" b_0))
+      (if (real? step_0) (void) (raise-argument-error who_0 "real?" step_0)))))
 (define-values
  (struct:list-stream
   make-list-stream
@@ -865,7 +865,19 @@
         (void)
         (raise-argument-error 'hash-empty? "hash?" table_0))
       (zero? (hash-count table_0)))))
-(define finish27
+(define print-value-columns
+  (make-parameter
+   +inf.0
+   (lambda (c_0)
+     (if (let ((or-part_0 (eqv? c_0 +inf.0)))
+           (if or-part_0 or-part_0 (if (exact-integer? c_0) (> c_0 5) #f)))
+       c_0
+       (raise-argument-error
+        'print-value-columns
+        "(or/c +inf.0 (and/c exact-integer? (>/c 5)))"
+        c_0)))
+   'print-value-columns))
+(define finish_2164
   (make-struct-type-install-properties
    '(queue)
    2
@@ -886,7 +898,7 @@
    #f
    2
    3))
-(define effect_2998 (finish27 struct:queue))
+(define effect_2998 (finish_2164 struct:queue))
 (define queue1.1
   (|#%name|
    queue
@@ -899,7 +911,7 @@
   (|#%name| set-queue-start! (record-mutator struct:queue 0)))
 (define set-queue-end!
   (|#%name| set-queue-end! (record-mutator struct:queue 1)))
-(define finish29
+(define finish_2845
   (make-struct-type-install-properties
    '(node)
    3
@@ -920,7 +932,7 @@
    #f
    3
    6))
-(define effect_1943 (finish29 struct:node$2))
+(define effect_1943 (finish_2845 struct:node$2))
 (define node2.1
   (|#%name|
    node
@@ -1133,7 +1145,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 finish37
+(define finish_2698
   (make-struct-type-install-properties
    '(node)
    5
@@ -1154,7 +1166,7 @@
    #f
    5
    0))
-(define effect_1944 (finish37 struct:node$1))
+(define effect_1944 (finish_2698 struct:node$1))
 (define node1.1$1
   (|#%name|
    node
@@ -1406,7 +1418,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 finish67
+(define finish_1970
   (make-struct-type-install-properties
    '(sandman)
    11
@@ -1433,7 +1445,7 @@
    #f
    11
    2047))
-(define effect_2951 (finish67 struct:sandman))
+(define effect_2951 (finish_1970 struct:sandman))
 (define sandman1.1
   (|#%name|
    sandman
@@ -1871,7 +1883,7 @@
              'guard-for-prop:evt
              "(or/c evt? (procedure-arity-includes/c 1) exact-nonnegative-integer?)"
              v_0))))))))
-(define finish85
+(define finish_2832
   (make-struct-type-install-properties
    '(selector-prop-evt-value)
    1
@@ -1892,7 +1904,7 @@
    #f
    1
    0))
-(define effect_2735 (finish85 struct:selector-prop-evt-value))
+(define effect_2735 (finish_2832 struct:selector-prop-evt-value))
 (define selector-prop-evt-value1.1
   (|#%name|
    selector-prop-evt-value
@@ -1919,7 +1931,7 @@
      (begin
        (let ((or-part_0 (primary-evt? v_0)))
          (if or-part_0 or-part_0 (secondary-evt? v_0)))))))
-(define finish87
+(define finish_2870
   (make-struct-type-install-properties
    '(poller)
    1
@@ -1940,7 +1952,7 @@
    #f
    1
    0))
-(define effect_2545 (finish87 struct:poller))
+(define effect_2545 (finish_2870 struct:poller))
 (define poller2.1
   (|#%name|
    poller
@@ -1948,7 +1960,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 finish89
+(define finish_2555
   (make-struct-type-install-properties
    '(poll-ctx)
    4
@@ -1969,7 +1981,7 @@
    #f
    4
    8))
-(define effect_2667 (finish89 struct:poll-ctx))
+(define effect_2667 (finish_2555 struct:poll-ctx))
 (define poll-ctx3.1
   (|#%name|
    poll-ctx
@@ -1986,7 +1998,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 finish92
+(define finish_2483
   (make-struct-type-install-properties
    '(never-evt)
    0
@@ -2010,7 +2022,7 @@
    #f
    0
    0))
-(define effect_2474 (finish92 struct:never-evt))
+(define effect_2474 (finish_2483 struct:never-evt))
 (define never-evt4.1
   (|#%name|
    never-evt
@@ -2027,7 +2039,7 @@
        ($value
         (if (impersonator? v) (never-evt?_1958 (impersonator-val v)) #f))))))
 (define the-never-evt (never-evt4.1))
-(define finish95
+(define finish_2218
   (make-struct-type-install-properties
    '(always-evt)
    0
@@ -2051,7 +2063,7 @@
    #f
    0
    0))
-(define effect_2333 (finish95 struct:always-evt))
+(define effect_2333 (finish_2218 struct:always-evt))
 (define always-evt5.1
   (|#%name|
    always-evt
@@ -2068,7 +2080,7 @@
        ($value
         (if (impersonator? v) (always-evt?_2466 (impersonator-val v)) #f))))))
 (define the-always-evt (always-evt5.1))
-(define finish98
+(define finish_2449
   (make-struct-type-install-properties
    '(async-evt)
    0
@@ -2092,7 +2104,7 @@
    #f
    0
    0))
-(define effect_2210 (finish98 struct:async-evt))
+(define effect_2210 (finish_2449 struct:async-evt))
 (define async-evt6.1
   (|#%name|
    async-evt
@@ -2109,7 +2121,7 @@
        ($value
         (if (impersonator? v) (async-evt?_2619 (impersonator-val v)) #f))))))
 (define the-async-evt (async-evt6.1))
-(define finish101
+(define finish_3384
   (make-struct-type-install-properties
    '(evt)
    2
@@ -2126,7 +2138,7 @@
    'wrap-evt))
 (define struct:wrap-evt
   (make-record-type-descriptor* 'evt #f (|#%nongenerative-uid| evt) #f #f 2 0))
-(define effect_2815 (finish101 struct:wrap-evt))
+(define effect_2815 (finish_3384 struct:wrap-evt))
 (define wrap-evt7.1
   (|#%name|
    wrap-evt
@@ -2167,7 +2179,7 @@
          s
          'evt
          'wrap))))))
-(define finish106
+(define finish_2655
   (make-struct-type-install-properties
    '(handle-evt)
    0
@@ -2188,7 +2200,7 @@
    #f
    0
    0))
-(define effect_3118 (finish106 struct:handle-evt))
+(define effect_3118 (finish_2655 struct:handle-evt))
 (define handle-evt8.1
   (|#%name|
    handle-evt
@@ -2206,7 +2218,7 @@
         (if (impersonator? v)
           (handle-evt?$1_2894 (impersonator-val v))
           #f))))))
-(define finish109
+(define finish_3332
   (make-struct-type-install-properties
    '(control-state-evt)
    5
@@ -2230,7 +2242,7 @@
    #f
    5
    0))
-(define effect_3002 (finish109 struct:control-state-evt))
+(define effect_3002 (finish_3332 struct:control-state-evt))
 (define control-state-evt9.1
   (|#%name|
    control-state-evt
@@ -2338,7 +2350,7 @@
          s
          'control-state-evt
          'retry-proc))))))
-(define finish117
+(define finish_2343
   (make-struct-type-install-properties
    '(evt)
    1
@@ -2355,7 +2367,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 (finish117 struct:poll-guard-evt))
+(define effect_2169 (finish_2343 struct:poll-guard-evt))
 (define poll-guard-evt10.1
   (|#%name|
    poll-guard-evt
@@ -2389,7 +2401,7 @@
          s
          'evt
          'proc))))))
-(define finish121
+(define finish_2902
   (make-struct-type-install-properties
    '(evt)
    1
@@ -2406,7 +2418,7 @@
    'choice-evt))
 (define struct:choice-evt
   (make-record-type-descriptor* 'evt #f (|#%nongenerative-uid| evt) #f #f 1 0))
-(define effect_2613 (finish121 struct:choice-evt))
+(define effect_2613 (finish_2902 struct:choice-evt))
 (define choice-evt11.1
   (|#%name|
    choice-evt
@@ -2468,7 +2480,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 finish124
+(define finish_2478
   (make-struct-type-install-properties
    '(delayed-poll)
    1
@@ -2489,7 +2501,7 @@
    #f
    1
    0))
-(define effect_2263 (finish124 struct:delayed-poll))
+(define effect_2263 (finish_2478 struct:delayed-poll))
 (define delayed-poll12.1
   (|#%name|
    delayed-poll
@@ -2499,7 +2511,7 @@
   (|#%name| delayed-poll? (record-predicate struct:delayed-poll)))
 (define delayed-poll-resume
   (|#%name| delayed-poll-resume (record-accessor struct:delayed-poll 0)))
-(define finish127
+(define finish_2235
   (make-struct-type-install-properties
    '(poller-evt)
    1
@@ -2520,7 +2532,7 @@
    #f
    1
    0))
-(define effect_2260 (finish127 struct:poller-evt))
+(define effect_2260 (finish_2235 struct:poller-evt))
 (define poller-evt13.1
   (|#%name|
    poller-evt
@@ -2555,7 +2567,7 @@
 (define-values
  (prop:waiter waiter? waiter-ref)
  (make-struct-type-property 'waiter))
-(define finish130
+(define finish_2743
   (make-struct-type-install-properties
    '(waiter-methods)
    2
@@ -2576,7 +2588,7 @@
    #f
    2
    0))
-(define effect_2191 (finish130 struct:waiter-methods))
+(define effect_2191 (finish_2743 struct:waiter-methods))
 (define waiter-methods1.1
   (|#%name|
    waiter-methods
@@ -2599,7 +2611,7 @@
 (define waiter-suspend!
   (lambda (w_0 interrupt-cb_0)
     (|#%app| (waiter-methods-suspend (waiter-ref w_0)) w_0 interrupt-cb_0)))
-(define finish133
+(define finish_2595
   (make-struct-type-install-properties
    '(select-waiter)
    1
@@ -2628,7 +2640,7 @@
    #f
    1
    0))
-(define effect_2826 (finish133 struct:select-waiter))
+(define effect_2826 (finish_2595 struct:select-waiter))
 (define select-waiter7.1
   (|#%name|
    select-waiter
@@ -2662,7 +2674,7 @@
          s
          'select-waiter
          'proc))))))
-(define finish136
+(define finish_2379
   (make-struct-type-install-properties
    '(custodian)
    13
@@ -2683,7 +2695,7 @@
    #f
    13
    8188))
-(define effect_2161 (finish136 struct:custodian))
+(define effect_2161 (finish_2379 struct:custodian))
 (define custodian1.1
   (|#%name|
    custodian
@@ -2795,7 +2807,7 @@
 (define-values
  (prop:place-message place-message? place-message-ref)
  (make-struct-type-property 'place-message))
-(define finish139
+(define finish_3006
   (make-struct-type-install-properties
    '(message-ized)
    1
@@ -2816,7 +2828,7 @@
    #f
    1
    0))
-(define effect_2995 (finish139 struct:message-ized))
+(define effect_2995 (finish_3006 struct:message-ized))
 (define message-ized1.1
   (|#%name|
    message-ized
@@ -3890,7 +3902,7 @@
                               (|#%app| (message-ized-unmessage v_1))
                               v_1)))))))))))))
        (loop_0 v_0)))))
-(define finish149
+(define finish_2216
   (make-struct-type-install-properties
    '(place)
    19
@@ -3917,7 +3929,7 @@
    #f
    19
    491440))
-(define effect_2619 (finish149 struct:place))
+(define effect_2619 (finish_2216 struct:place))
 (define place1.1
   (|#%name|
    place
@@ -4053,7 +4065,7 @@
                    (for-loop_0 lst_0))))
               (void)))))
       (void))))
-(define finish154
+(define finish_2797
   (make-struct-type-install-properties
    '(semaphore)
    1
@@ -4081,7 +4093,7 @@
    #f
    1
    1))
-(define effect_2927 (finish154 struct:semaphore))
+(define effect_2927 (finish_2797 struct:semaphore))
 (define semaphore1.1
   (|#%name|
    semaphore
@@ -4093,7 +4105,7 @@
 (define set-semaphore-count!
   (|#%name| set-semaphore-count! (record-mutator struct:semaphore 0)))
 (define count-field-pos 2)
-(define finish157
+(define finish_2301
   (make-struct-type-install-properties
    '(semaphore-peek-evt)
    1
@@ -4120,7 +4132,7 @@
    #f
    1
    0))
-(define effect_2414 (finish157 struct:semaphore-peek-evt))
+(define effect_2414 (finish_2301 struct:semaphore-peek-evt))
 (define semaphore-peek-evt2.1
   (|#%name|
    semaphore-peek-evt
@@ -4156,7 +4168,7 @@
          s
          'semaphore-peek-evt
          'sema))))))
-(define finish161
+(define finish_2668
   (make-struct-type-install-properties
    '(semaphore-peek-select-waiter)
    0
@@ -4177,7 +4189,7 @@
    #f
    0
    0))
-(define effect_2387 (finish161 struct:semaphore-peek-select-waiter))
+(define effect_2387 (finish_2668 struct:semaphore-peek-select-waiter))
 (define semaphore-peek-select-waiter3.1
   (|#%name|
    semaphore-peek-select-waiter
@@ -4398,7 +4410,7 @@
         (set-semaphore-count! s_0 (sub1 c_0))
         (internal-error
          "semaphore-wait/atomic: cannot decrement semaphore")))))
-(define finish174
+(define finish_2317
   (make-struct-type-install-properties
    '(node)
    2
@@ -4419,7 +4431,7 @@
    #f
    2
    3))
-(define effect_2547 (finish174 struct:node))
+(define effect_2547 (finish_2317 struct:node))
 (define node1.1
   (|#%name|
    node
@@ -4434,7 +4446,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 finish176
+(define finish_2444
   (make-struct-type-install-properties
    '(thread-group)
    4
@@ -4455,7 +4467,7 @@
    #f
    4
    14))
-(define effect_2514 (finish176 struct:thread-group))
+(define effect_2514 (finish_2444 struct:thread-group))
 (define thread-group2.1
   (|#%name|
    thread-group
@@ -4606,7 +4618,7 @@
                     (begin-unsafe n_0)
                     accum_1)))))))))
        (loop_0 (thread-group-chain-start parent_0) accum_0)))))
-(define finish188
+(define finish_2546
   (make-struct-type-install-properties
    '(schedule-info)
    2
@@ -4627,7 +4639,7 @@
    #f
    2
    3))
-(define effect_2462 (finish188 struct:schedule-info))
+(define effect_2462 (finish_2546 struct:schedule-info))
 (define schedule-info1.1
   (|#%name|
    schedule-info
@@ -4737,7 +4749,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 finish196
+(define finish_2437
   (make-struct-type-install-properties
    '(plumber)
    2
@@ -4758,7 +4770,7 @@
    #f
    2
    0))
-(define effect_2412 (finish196 struct:plumber))
+(define effect_2412 (finish_2437 struct:plumber))
 (define plumber1.1
   (|#%name|
    plumber
@@ -4785,7 +4797,7 @@
          (raise-argument-error 'current-plumber "plumber?" v_0))
        v_0))
    'current-plumber))
-(define finish200
+(define finish_2219
   (make-struct-type-install-properties
    '(plumber-flush-handle)
    2
@@ -4806,7 +4818,7 @@
    #f
    2
    0))
-(define effect_2328 (finish200 struct:plumber-flush-handle))
+(define effect_2328 (finish_2219 struct:plumber-flush-handle))
 (define plumber-flush-handle2.1
   (|#%name|
    plumber-flush-handle
@@ -5017,7 +5029,7 @@
     (|#%name|
      exit
      (case-lambda (() (begin (exit_0 #t))) ((v1_0) (exit_0 v1_0))))))
-(define finish204
+(define finish_2167
   (make-struct-type-install-properties
    '(custodian-box)
    2
@@ -5043,7 +5055,7 @@
    #f
    2
    1))
-(define effect_2694 (finish204 struct:custodian-box))
+(define effect_2694 (finish_2167 struct:custodian-box))
 (define custodian-box1.1
   (|#%name|
    custodian-box
@@ -5057,7 +5069,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 finish206
+(define finish_2995
   (make-struct-type-install-properties
    '(willed-callback)
    2
@@ -5078,7 +5090,7 @@
    #f
    2
    0))
-(define effect_2527 (finish206 struct:willed-callback))
+(define effect_2527 (finish_2995 struct:willed-callback))
 (define willed-callback2.1
   (|#%name|
    willed-callback
@@ -5090,7 +5102,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 finish208
+(define finish_2882
   (make-struct-type-install-properties
    '(at-exit-callback)
    0
@@ -5111,7 +5123,7 @@
    #f
    0
    0))
-(define effect_2512 (finish208 struct:at-exit-callback))
+(define effect_2512 (finish_2882 struct:at-exit-callback))
 (define at-exit-callback3.1
   (|#%name|
    at-exit-callback
@@ -5119,7 +5131,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 finish210
+(define finish_2398
   (make-struct-type-install-properties
    '(custodian-reference)
    1
@@ -5140,7 +5152,7 @@
    #f
    1
    1))
-(define effect_2141 (finish210 struct:custodian-reference))
+(define effect_2141 (finish_2398 struct:custodian-reference))
 (define custodian-reference4.1
   (|#%name|
    custodian-reference
@@ -6458,7 +6470,7 @@
                   (void)))
               (void)))))))
      (loop_0 mref_0))))
-(define finish227
+(define finish_2220
   (make-struct-type-install-properties
    '(thread)
    24
@@ -6505,7 +6517,7 @@
    #f
    24
    16777082))
-(define effect_2668 (finish227 struct:thread))
+(define effect_2668 (finish_2220 struct:thread))
 (define thread1.1
   (|#%name|
    thread
@@ -6974,7 +6986,7 @@
            (void)
            (raise-argument-error 'thread-wait "thread?" t_0))
          (1/semaphore-wait (|#%app| get-thread-dead-sema t_0)))))))
-(define finish240
+(define finish_3191
   (make-struct-type-install-properties
    '(thread-dead-evt)
    1
@@ -6999,7 +7011,7 @@
    #f
    1
    0))
-(define effect_2691 (finish240 struct:dead-evt))
+(define effect_2691 (finish_3191 struct:dead-evt))
 (define dead-evt13.1
   (|#%name|
    dead-evt
@@ -7311,7 +7323,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 finish252
+(define finish_2826
   (make-struct-type-install-properties
    '(transitive-resume)
    2
@@ -7332,7 +7344,7 @@
    #f
    2
    0))
-(define effect_3100 (finish252 struct:transitive-resume))
+(define effect_3100 (finish_2826 struct:transitive-resume))
 (define transitive-resume16.1
   (|#%name|
    transitive-resume
@@ -7442,7 +7454,7 @@
           (set-thread-interrupt-callback! t_0 #f)
           (|#%app| interrupt-callback_0))
         (void)))))
-(define finish258
+(define finish_2360
   (make-struct-type-install-properties
    '(suspend-resume-evt)
    2
@@ -7469,7 +7481,7 @@
    #f
    2
    2))
-(define effect_2478 (finish258 struct:suspend-resume-evt))
+(define effect_2478 (finish_2360 struct:suspend-resume-evt))
 (define suspend-resume-evt17.1
   (|#%name|
    suspend-resume-evt
@@ -7543,7 +7555,7 @@
          v
          'suspend-resume-evt
          'thread))))))
-(define finish264
+(define finish_2344
   (make-struct-type-install-properties
    '(thread-suspend-evt)
    0
@@ -7564,7 +7576,7 @@
    #f
    0
    0))
-(define effect_2442 (finish264 struct:suspend-evt))
+(define effect_2442 (finish_2344 struct:suspend-evt))
 (define suspend-evt18.1
   (|#%name|
    suspend-evt
@@ -7580,7 +7592,7 @@
        #t
        ($value
         (if (impersonator? v) (suspend-evt?_3224 (impersonator-val v)) #f))))))
-(define finish267
+(define finish_2494
   (make-struct-type-install-properties
    '(thread-resume-evt)
    0
@@ -7601,7 +7613,7 @@
    #f
    0
    0))
-(define effect_2874 (finish267 struct:resume-evt))
+(define effect_2874 (finish_2494 struct:resume-evt))
 (define resume-evt19.1
   (|#%name|
    resume-evt
@@ -8019,7 +8031,7 @@
                 (begin-unsafe (queue-add-front! (thread-mailbox t_0) msg_0)))
               lst_0))
            (end-atomic)))))))
-(define finish282
+(define finish_2470
   (make-struct-type-install-properties
    '(thread-receive-evt)
    0
@@ -8080,7 +8092,7 @@
    #f
    0
    0))
-(define effect_2506 (finish282 struct:thread-receiver-evt))
+(define effect_2506 (finish_2470 struct:thread-receiver-evt))
 (define thread-receiver-evt26.1
   (|#%name|
    thread-receiver-evt
@@ -8127,7 +8139,7 @@
                 #f))))
        (begin-unsafe (set! thread-engine-for-roots thread-engine_0))))
     (void)))
-(define finish286
+(define finish_2800
   (make-struct-type-install-properties
    '(channel)
    2
@@ -8152,7 +8164,7 @@
    #f
    2
    0))
-(define effect_2481 (finish286 struct:channel))
+(define effect_2481 (finish_2800 struct:channel))
 (define channel1.1
   (|#%name|
    channel
@@ -8199,7 +8211,7 @@
          s
          'channel
          'put-queue))))))
-(define finish293
+(define finish_1979
   (make-struct-type-install-properties
    '(channel-put-evt)
    2
@@ -8230,7 +8242,7 @@
    #f
    2
    0))
-(define effect_2715 (finish293 struct:channel-put-evt*))
+(define effect_2715 (finish_1979 struct:channel-put-evt*))
 (define channel-put-evt*2.1
   (|#%name|
    channel-put-evt*
@@ -8280,7 +8292,7 @@
          s
          'channel-put-evt
          'v))))))
-(define finish299
+(define finish_2400
   (make-struct-type-install-properties
    '(channel-select-waiter)
    1
@@ -8301,7 +8313,7 @@
    #f
    1
    0))
-(define effect_2956 (finish299 struct:channel-select-waiter))
+(define effect_2956 (finish_2400 struct:channel-select-waiter))
 (define channel-select-waiter3.1
   (|#%name|
    channel-select-waiter
@@ -8794,7 +8806,7 @@
                    (car args_1))
                   (loop_0 (cddr args_1))))))))))
      (loop_0 args_0))))
-(define finish329
+(define finish_2580
   (make-struct-type-install-properties
    '(syncing)
    5
@@ -8815,7 +8827,7 @@
    #f
    5
    31))
-(define effect_2363 (finish329 struct:syncing))
+(define effect_2363 (finish_2580 struct:syncing))
 (define syncing1.1
   (|#%name|
    syncing
@@ -9000,7 +9012,7 @@
          v
          'syncing
          'need-retry?))))))
-(define finish342
+(define finish_2341
   (make-struct-type-install-properties
    '(syncer)
    9
@@ -9021,7 +9033,7 @@
    #f
    9
    511))
-(define effect_2176 (finish342 struct:syncer))
+(define effect_2176 (finish_2341 struct:syncer))
 (define syncer2.1
   (|#%name|
    syncer
@@ -10530,7 +10542,7 @@
                                      (end-atomic)))))))))))))))))
           (retry_0))
          (end-atomic))))))
-(define finish392
+(define finish_2891
   (make-struct-type-install-properties
    '(evt)
    1
@@ -10548,7 +10560,7 @@
    'replacing-evt))
 (define struct:replacing-evt
   (make-record-type-descriptor* 'evt #f (|#%nongenerative-uid| evt) #f #f 1 0))
-(define effect_2704 (finish392 struct:replacing-evt))
+(define effect_2704 (finish_2891 struct:replacing-evt))
 (define replacing-evt34.1
   (|#%name|
    replacing-evt
@@ -10582,7 +10594,7 @@
          s
          'evt
          'guard))))))
-(define finish396
+(define finish_2391
   (make-struct-type-install-properties
    '(evt)
    3
@@ -10599,7 +10611,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 (finish396 struct:nested-sync-evt))
+(define effect_2461 (finish_2391 struct:nested-sync-evt))
 (define nested-sync-evt35.1
   (|#%name|
    nested-sync-evt
@@ -10799,7 +10811,7 @@
 (define cell.2$3
   (unsafe-make-place-local
    (wrap-evt7.1 (unsafe-place-local-ref cell.1$5) void)))
-(define finish405
+(define finish_2856
   (make-struct-type-install-properties
    '(system-idle-evt)
    0
@@ -10820,7 +10832,7 @@
    #f
    0
    0))
-(define effect_2195 (finish405 struct:system-idle-evt))
+(define effect_2195 (finish_2856 struct:system-idle-evt))
 (define system-idle-evt1.1
   (|#%name|
    system-idle-evt
@@ -10860,7 +10872,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 finish411
+(define finish_2486
   (make-struct-type-install-properties
    '(future)
    10
@@ -10881,7 +10893,7 @@
    #f
    10
    1016))
-(define effect_2258 (finish411 struct:future*))
+(define effect_2258 (finish_2486 struct:future*))
 (define future*1.1
   (|#%name|
    future*
@@ -10963,7 +10975,7 @@
       (if (eq? (unbox lock_0) 0)
         (internal-error "lock release failed!")
         (lock-release lock_0)))))
-(define finish414
+(define finish_2387
   (make-struct-type-install-properties
    '(future-event)
    6
@@ -10984,7 +10996,7 @@
    #f
    6
    63))
-(define effect_2115 (finish414 struct:future-event))
+(define effect_2115 (finish_2387 struct:future-event))
 (define future-event1.1
   (|#%name|
    future-event
@@ -11255,7 +11267,7 @@
 (define init-future-place! (lambda () (init-future-logging-place!)))
 (define 1/futures-enabled?
   (|#%name| futures-enabled? (lambda () (begin (|#%app| threaded?)))))
-(define finish429
+(define finish_2009
   (make-struct-type-install-properties
    '(future-evt)
    1
@@ -11290,7 +11302,7 @@
    #f
    1
    0))
-(define effect_2000 (finish429 struct:future-evt))
+(define effect_2000 (finish_2009 struct:future-evt))
 (define future-evt1.1
   (|#%name|
    future-evt
@@ -11698,7 +11710,7 @@
                    v_0))))))))))
 (define pthread-count 1)
 (define set-processor-count! (lambda (n_0) (set! pthread-count n_0)))
-(define finish433
+(define finish_3061
   (make-struct-type-install-properties
    '(scheduler)
    6
@@ -11719,7 +11731,7 @@
    #f
    6
    7))
-(define effect_2657 (finish433 struct:scheduler))
+(define effect_2657 (finish_3061 struct:scheduler))
 (define scheduler7.1
   (|#%name|
    scheduler
@@ -11744,7 +11756,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 finish435
+(define finish_2503
   (make-struct-type-install-properties
    '(worker)
    5
@@ -11765,7 +11777,7 @@
    #f
    5
    26))
-(define effect_2821 (finish435 struct:worker))
+(define effect_2821 (finish_2503 struct:worker))
 (define worker8.1
   (|#%name|
    worker
@@ -12592,7 +12604,7 @@
 (define check-place-activity void)
 (define set-check-place-activity!
   (lambda (proc_0) (set! check-place-activity proc_0)))
-(define finish454
+(define finish_2685
   (make-struct-type-install-properties
    '(alarm-evt)
    1
@@ -12625,7 +12637,7 @@
    #f
    1
    0))
-(define effect_2822 (finish454 struct:alarm-evt))
+(define effect_2822 (finish_2685 struct:alarm-evt))
 (define alarm-evt1.1
   (|#%name|
    alarm-evt
@@ -13151,7 +13163,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 finish459
+(define finish_2234
   (make-struct-type-install-properties
    '(will-executor)
    2
@@ -13180,7 +13192,7 @@
    #f
    2
    0))
-(define effect_2170 (finish459 struct:will-executor))
+(define effect_2170 (finish_2234 struct:will-executor))
 (define will-executor1.1
   (|#%name|
    will-executor
@@ -13497,7 +13509,7 @@
           v_0))
        v_0))
    'current-thread-initial-stack-size))
-(define finish463
+(define finish_2691
   (make-struct-type-install-properties
    '(place-event)
    4
@@ -13518,7 +13530,7 @@
    #f
    4
    15))
-(define effect_2598 (finish463 struct:place-event))
+(define effect_2598 (finish_2691 struct:place-event))
 (define place-event1.1
   (|#%name|
    place-event
@@ -14181,7 +14193,7 @@
                          (|#%app| (sandman-do-sleep the-sandman) #f))
                         (loop_0)))))))))))
        (loop_0)))))
-(define finish479
+(define finish_3022
   (make-struct-type-install-properties
    '(place-dead-evt)
    2
@@ -14225,7 +14237,7 @@
    #f
    2
    0))
-(define effect_2480 (finish479 struct:place-done-evt))
+(define effect_2480 (finish_3022 struct:place-done-evt))
 (define place-done-evt3.1
   (|#%name|
    place-done-evt
@@ -14287,7 +14299,7 @@
            (void)
            (raise-argument-error 'place-dead-evt "place?" p_0))
          (place-done-evt3.1 p_0 #f))))))
-(define finish483
+(define finish_2512
   (make-struct-type-install-properties
    '(message-queue)
    6
@@ -14308,7 +14320,7 @@
    #f
    6
    22))
-(define effect_2109 (finish483 struct:message-queue))
+(define effect_2109 (finish_2512 struct:message-queue))
 (define message-queue4.1
   (|#%name|
    message-queue
@@ -14442,7 +14454,7 @@
                       (void))
                     (|#%app| host:mutex-release lock_0)
                     (|#%app| success-k_0 (car q_0))))))))))))
-(define finish487
+(define finish_2441
   (make-struct-type-install-properties
    '(place-channel)
    6
@@ -14482,7 +14494,7 @@
    #f
    6
    0))
-(define effect_2172 (finish487 struct:pchannel))
+(define effect_2172 (finish_2441 struct:pchannel))
 (define pchannel5.1
   (|#%name|
    pchannel
@@ -14731,7 +14743,7 @@
       (lambda () (place-has-activity! (unsafe-place-local-ref cell.1$2)))
       (lambda () (ensure-wakeup-handle!))))
     (void)))
-(define finish497
+(define finish_2299
   (make-struct-type-install-properties
    '(fsemaphore)
    4
@@ -14752,7 +14764,7 @@
    #f
    4
    13))
-(define effect_2528 (finish497 struct:fsemaphore))
+(define effect_2528 (finish_2299 struct:fsemaphore))
 (define fsemaphore1.1
   (|#%name|
    fsemaphore
@@ -14774,7 +14786,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 finish502
+(define finish_2697
   (make-struct-type-install-properties
    '(fsemaphore-box-evt)
    1
@@ -14801,7 +14813,7 @@
    #f
    1
    0))
-(define effect_2415 (finish502 struct:fsemaphore-box-evt))
+(define effect_2415 (finish_2697 struct:fsemaphore-box-evt))
 (define fsemaphore-box-evt2.1
   (|#%name|
    fsemaphore-box-evt
@@ -14976,7 +14988,7 @@
           fork-pthread
           (lambda () (begin (start-atomic) (|#%app| proc_0))))
          (void))))))
-(define finish505
+(define finish_2628
   (make-struct-type-install-properties
    '(os-semaphore)
    3
@@ -14997,7 +15009,7 @@
    #f
    3
    1))
-(define effect_2703 (finish505 struct:os-semaphore))
+(define effect_2703 (finish_2628 struct:os-semaphore))
 (define os-semaphore1.1
   (|#%name|
    os-semaphore
diff --git a/racket/src/io/port/custom-input-port.rkt b/racket/src/io/port/custom-input-port.rkt
index aaef9a6369..29a7baaba2 100644
--- a/racket/src/io/port/custom-input-port.rkt
+++ b/racket/src/io/port/custom-input-port.rkt
@@ -180,6 +180,10 @@
           (wrap-procedure-result r)]
          [else r])]))
 
+  ;; in atomic mode
+  (define (read-in/inner self dest-bstr dest-start dest-end copy? to-buffer)
+    (read-in self dest-bstr dest-start dest-end copy?))
+
   ;; in atomic mode
   ;; Used only if `user-peek-in` is a function:
   (define (peek-in self dest-bstr dest-start dest-end skip-k progress-evt copy?)
@@ -290,7 +294,7 @@
            [name name]
            [offset init-offset]
            #:override
-           [read-in/inner read-in]
+           [read-in/inner read-in/inner]
            [close (values
                    (lambda (self)
                      (close self)
diff --git a/racket/src/io/port/fd-port.rkt b/racket/src/io/port/fd-port.rkt
index 51aa595607..f52870e939 100644
--- a/racket/src/io/port/fd-port.rkt
+++ b/racket/src/io/port/fd-port.rkt
@@ -50,16 +50,30 @@
   [fd #f]
   [fd-refcount (box 1)]
   [custodian-reference #f]
+  [is-converted #f]
   
   #:public
   [on-close (lambda () (void))]
   [raise-read-error (lambda (n)
                       (raise-filesystem-error #f n "error reading from stream port"))]
-  
+
   #:override
   [read-in/inner
-   (lambda (dest-bstr start end copy?)
-     (define n (rktio_read_in rktio fd dest-bstr start end))
+   (lambda (dest-bstr start end copy? to-buffer?)
+     (define n
+       (cond
+         [(and to-buffer?
+               (rktio_fd_is_text_converted rktio fd))
+          ;; need to keep track of whether any bytes in the buffer were converted
+          (when (or (not is-converted)
+                    ((bytes-length is-converted) . < . end))
+            (define new-is-converted (make-bytes end))
+            (when is-converted
+              (bytes-copy! new-is-converted 0 is-converted))
+            (set! is-converted new-is-converted))
+          (rktio_read_converted_in rktio fd dest-bstr start end is-converted start)]
+         [else
+          (rktio_read_in rktio fd dest-bstr start end)]))
      (cond
        [(rktio-error? n)
         (end-atomic)
@@ -80,7 +94,7 @@
    (case-lambda
      [()
       (define pos (get-file-position fd))
-      (and pos (buffer-adjust-pos pos))]
+      (and pos (buffer-adjust-pos pos is-converted))]
      [(pos)
       (purge-buffer)
       (set-file-position fd pos)])]
diff --git a/racket/src/io/port/peek-via-read-port.rkt b/racket/src/io/port/peek-via-read-port.rkt
index 02b166bde3..82e0207a1d 100644
--- a/racket/src/io/port/peek-via-read-port.rkt
+++ b/racket/src/io/port/peek-via-read-port.rkt
@@ -21,7 +21,7 @@
   #:public
   ;; in atomic mode; must override
   [read-in/inner
-   (lambda (dest-bstr start end copy?)
+   (lambda (dest-bstr start end copy? to-buffer?)
      0)]
 
   #:static
@@ -40,9 +40,19 @@
      (progress!))]
 
   [buffer-adjust-pos
-   (lambda (i)
+   (lambda (i is-converted) ; is-converted reports on CRLF conversions in the buffer
      (define b buffer)
-     (- i (fx- end-pos (if (direct-bstr b) (direct-pos b) pos))))]
+     (define start-pos (if (direct-bstr b) (direct-pos b) pos))
+     (define r (- i (fx- end-pos start-pos)))
+     (cond
+       [is-converted (let loop ([pos start-pos] [r r])
+                       (if (fx= pos end-pos)
+                           r
+                           (loop (fx+ pos 1)
+                                 (if (eqv? 0 (bytes-ref is-converted pos))
+                                     r
+                                     (- r 1)))))]
+       [else r]))]
 
   ;; in atomic mode
   [default-buffer-mode
@@ -55,7 +65,7 @@
   [pull-some-bytes
    (lambda ([amt (if (eq? 'block buffer-mode) (bytes-length bstr) 1)] [offset 0] [init-pos 0])
      (define get-end (min (+ amt offset) (bytes-length bstr)))
-     (define v (send peek-via-read-input-port this read-in/inner bstr offset get-end #f))
+     (define v (send peek-via-read-input-port this read-in/inner bstr offset get-end #f #t))
      (cond
        [(eof-object? v)
         (set! peeked-eof? #t)
@@ -152,7 +162,7 @@
                [(or (eqv? v 0) (evt? v)) v]
                [else (try-again)])]
             [else
-             (define v (send peek-via-read-input-port this read-in/inner dest-bstr start end copy?))
+             (define v (send peek-via-read-input-port this read-in/inner dest-bstr start end copy? #f))
              (unless (eqv? v 0)
                (progress!))
              v])])))]
diff --git a/racket/src/rktio/rktio.def b/racket/src/rktio/rktio.def
index d0a9a94509..e65e4cb1fa 100644
--- a/racket/src/rktio/rktio.def
+++ b/racket/src/rktio/rktio.def
@@ -26,6 +26,7 @@ rktio_write
 rktio_read_converted
 rktio_read_in
 rktio_write_in
+rktio_read_converted_in
 rktio_buffered_byte_count
 rktio_poll_read_ready
 rktio_poll_write_ready
diff --git a/racket/src/rktio/rktio.h b/racket/src/rktio/rktio.h
index a119053d78..a11714cc6f 100644
--- a/racket/src/rktio/rktio.h
+++ b/racket/src/rktio/rktio.h
@@ -204,7 +204,7 @@ RKTIO_EXTERN rktio_bool_t rktio_fd_is_terminal(rktio_t *rktio, rktio_fd_t *rfd);
 /* The functions mostly report values of recorded mode flags. */
 
 RKTIO_EXTERN rktio_bool_t rktio_fd_is_text_converted(rktio_t *rktio, rktio_fd_t *rfd);
-/* Reports whether `RKTIO_OPEN_TEXT` was use and has an effect. The
+/* Reports whether `RKTIO_OPEN_TEXT` was used and has an effect. The
    `RKTIO_OPEN_TEXT` flag has an effect only on Windows. */
 
 RKTIO_EXTERN rktio_bool_t rktio_fd_is_pending_open(rktio_t *rktio, rktio_fd_t *rfd);
@@ -295,8 +295,11 @@ RKTIO_EXTERN_ERR(RKTIO_READ_ERROR)
 intptr_t rktio_read_in(rktio_t *rktio, rktio_fd_t *fd, char *buffer, intptr_t start, intptr_t end);
 RKTIO_EXTERN_ERR(RKTIO_WRITE_ERROR)
 intptr_t rktio_write_in(rktio_t *rktio, rktio_fd_t *fd, const char *buffer, intptr_t start, intptr_t end);
-/* Like `rktio_read` and `rktio_write`, but accepting start and end
-   positions within `buffer`. */
+RKTIO_EXTERN_ERR(RKTIO_READ_ERROR)
+intptr_t rktio_read_converted_in(rktio_t *rktio, rktio_fd_t *fd, char *buffer, intptr_t start, intptr_t len,
+                                 char *is_converted, intptr_t converted_start);
+/* Like `rktio_read`, `rktio_write`, and `rktio_read_converted` but
+   accepting start and end positions within `buffer`. */
 
 RKTIO_EXTERN_NOERR intptr_t rktio_buffered_byte_count(rktio_t *rktio, rktio_fd_t *fd);
 /* Reports the number of bytes that are buffered from the file descriptor.
diff --git a/racket/src/rktio/rktio.inc b/racket/src/rktio/rktio.inc
index f1cecddb9e..05055a569f 100644
--- a/racket/src/rktio/rktio.inc
+++ b/racket/src/rktio/rktio.inc
@@ -26,6 +26,7 @@ Sforeign_symbol("rktio_write", (void *)rktio_write);
 Sforeign_symbol("rktio_read_converted", (void *)rktio_read_converted);
 Sforeign_symbol("rktio_read_in", (void *)rktio_read_in);
 Sforeign_symbol("rktio_write_in", (void *)rktio_write_in);
+Sforeign_symbol("rktio_read_converted_in", (void *)rktio_read_converted_in);
 Sforeign_symbol("rktio_buffered_byte_count", (void *)rktio_buffered_byte_count);
 Sforeign_symbol("rktio_poll_read_ready", (void *)rktio_poll_read_ready);
 Sforeign_symbol("rktio_poll_write_ready", (void *)rktio_poll_write_ready);
diff --git a/racket/src/rktio/rktio.rktl b/racket/src/rktio/rktio.rktl
index 3b7549de6d..8f0af4d187 100644
--- a/racket/src/rktio/rktio.rktl
+++ b/racket/src/rktio/rktio.rktl
@@ -355,6 +355,18 @@
   ((*ref char) buffer)
   (intptr_t start)
   (intptr_t end)))
+(define-function/errno
+ RKTIO_READ_ERROR
+ ()
+ intptr_t
+ rktio_read_converted_in
+ (((ref rktio_t) rktio)
+  ((ref rktio_fd_t) fd)
+  ((*ref char) buffer)
+  (intptr_t start)
+  (intptr_t len)
+  ((*ref char) is_converted)
+  (intptr_t converted_start)))
 (define-function
  ()
  intptr_t
diff --git a/racket/src/rktio/rktio_fd.c b/racket/src/rktio/rktio_fd.c
index 29d5468496..4a7a4c9ce2 100644
--- a/racket/src/rktio/rktio_fd.c
+++ b/racket/src/rktio/rktio_fd.c
@@ -1024,6 +1024,12 @@ intptr_t rktio_read_converted(rktio_t *rktio, rktio_fd_t *rfd, char *buffer, int
 #endif
 }
 
+intptr_t rktio_read_converted_in(rktio_t *rktio, rktio_fd_t *rfd, char *buffer, intptr_t start, intptr_t end,
+                                 char *is_converted, intptr_t converted_start)
+{
+  return rktio_read_converted(rktio, rfd, buffer+start, end-start, is_converted+converted_start);
+}
+
 intptr_t rktio_read(rktio_t *rktio, rktio_fd_t *rfd, char *buffer, intptr_t len)
 {
   return rktio_read_converted(rktio, rfd, buffer, len, NULL);