diff --git a/racket/src/cs/main.sps b/racket/src/cs/main.sps
index 5aadb205eb..74d77bff2a 100644
--- a/racket/src/cs/main.sps
+++ b/racket/src/cs/main.sps
@@ -433,14 +433,14 @@
    (or stderr-logging-arg
        (let ([spec (getenv "PLTSTDERR")])
          (if spec
-             (parse-logging-spec spec "in PLTSTDERR environment variable" #f)
+             (parse-logging-spec "stderr" spec "in PLTSTDERR environment variable" #f)
              '(error)))))
 
  (define stdout-logging
    (or stdout-logging-arg
        (let ([spec (getenv "PLTSTDOUT")])
          (if spec
-             (parse-logging-spec spec "in PLTSTDOUT environment variable" #f)
+             (parse-logging-spec "stdout" spec "in PLTSTDOUT environment variable" #f)
              '()))))
 
  (when (getenv "PLT_STATS_ON_BREAK")
diff --git a/racket/src/io/path/path.rkt b/racket/src/io/path/path.rkt
index 7398ca70bc..0dcb3cae93 100644
--- a/racket/src/io/path/path.rkt
+++ b/racket/src/io/path/path.rkt
@@ -13,21 +13,21 @@
          ->path)
 
 (struct path (bytes convention)
-        #:property prop:custom-write
-        (lambda (p port mode)
-          (when mode
-            (write-string "#<path:" port))
-          (write-string (bytes->string/locale (path-bytes p)) port)
-          (when mode
-            (write-string ">" port)))
-        #:property prop:equal+hash
-        (list
-         (lambda (p1 p2 eql?)
-           (eql? (path-bytes p1) (path-bytes p2)))
-         (lambda (p hc)
-           (hc (path-bytes p)))
-         (lambda (p hc)
-           (hc (path-bytes p)))))
+  #:property prop:custom-write
+  (lambda (p port mode)
+    (when mode
+      (write-string "#<path:" port))
+    (write-string (bytes->string/locale (path-bytes p)) port)
+    (when mode
+      (write-string ">" port)))
+  #:property prop:equal+hash
+  (list
+   (lambda (p1 p2 eql?)
+     (eql? (path-bytes p1) (path-bytes p2)))
+   (lambda (p hc)
+     (hc (path-bytes p)))
+   (lambda (p hc)
+     (hc (path-bytes p)))))
 
 (define is-path?
   (let ([path? (lambda (p)
diff --git a/racket/src/io/port/bytes-input.rkt b/racket/src/io/port/bytes-input.rkt
index 96bd330370..9bbc998153 100644
--- a/racket/src/io/port/bytes-input.rkt
+++ b/racket/src/io/port/bytes-input.rkt
@@ -1,10 +1,8 @@
 #lang racket/base
 (require "../common/check.rkt"
-         "../host/thread.rkt"
          "parameter.rkt"
          "read-and-peek.rkt"
          "input-port.rkt"
-         "count.rkt"
          "progress-evt.rkt"
          "flush-output.rkt")
 
diff --git a/racket/src/io/port/custom-input-port.rkt b/racket/src/io/port/custom-input-port.rkt
index 9a1871afa7..c6fb4da96a 100644
--- a/racket/src/io/port/custom-input-port.rkt
+++ b/racket/src/io/port/custom-input-port.rkt
@@ -2,11 +2,9 @@
 (require "../common/check.rkt"
          "../host/thread.rkt"
          "input-port.rkt"
-         "output-port.rkt"
          "custom-port.rkt"
          "pipe.rkt"
-         "peek-via-read-port.rkt"
-         "buffer-mode.rkt")
+         "peek-via-read-port.rkt")
 
 (provide make-input-port)
 
diff --git a/racket/src/io/port/string-input.rkt b/racket/src/io/port/string-input.rkt
index 9a23472b6e..4eab2a7f5c 100644
--- a/racket/src/io/port/string-input.rkt
+++ b/racket/src/io/port/string-input.rkt
@@ -3,7 +3,6 @@
          "../host/thread.rkt"
          "parameter.rkt"
          "read-and-peek.rkt"
-         "port.rkt"
          "input-port.rkt"
          (submod "bytes-input.rkt" internal)
          "../string/utf-8-decode.rkt"
diff --git a/racket/src/thread/channel.rkt b/racket/src/thread/channel.rkt
index 104d90dbe8..520d8e378f 100644
--- a/racket/src/thread/channel.rkt
+++ b/racket/src/thread/channel.rkt
@@ -26,20 +26,20 @@
 
 (struct channel (get-queue
                  put-queue)
-        #:property
-        prop:evt
-        (poller (lambda (ch poll-ctx)
-                  (channel-get/poll ch poll-ctx))))
+  #:property
+  prop:evt
+  (poller (lambda (ch poll-ctx)
+            (channel-get/poll ch poll-ctx))))
 
 (struct channel-put-evt* (ch v)
-        #:property
-        prop:evt
-        (poller (lambda (cp poll-ctx)
-                  (channel-put/poll (channel-put-evt*-ch cp)
-                                    (channel-put-evt*-v cp)
-                                    cp
-                                    poll-ctx)))
-        #:reflection-name 'channel-put-evt)
+  #:property
+  prop:evt
+  (poller (lambda (cp poll-ctx)
+            (channel-put/poll (channel-put-evt*-ch cp)
+                              (channel-put-evt*-v cp)
+                              cp
+                              poll-ctx)))
+  #:reflection-name 'channel-put-evt)
 
 ;; A channel must not match get and put from the same thread, which is
 ;; a danger when `sync` queues up multiple events at a time:
@@ -209,6 +209,7 @@
 (define (set-sync-on-channel! sync)
   (set! sync-on-channel sync))
 
-;; 
+;; ----------------------------------------
+
 (define-values (impersonator-prop:channel-put channel-put-impersonator? channel-put-impersonator-ref)
   (make-impersonator-property 'channel-put-impersonator))
diff --git a/racket/src/thread/evt.rkt b/racket/src/thread/evt.rkt
index 903689450e..bf10dfdd62 100644
--- a/racket/src/thread/evt.rkt
+++ b/racket/src/thread/evt.rkt
@@ -1,6 +1,5 @@
 #lang racket/base
-(require racket/unsafe/ops
-         "atomic.rkt")
+(require "atomic.rkt")
 
 (provide prop:evt
          evt?
diff --git a/racket/src/thread/plumber.rkt b/racket/src/thread/plumber.rkt
index 74cd85adbc..6250075296 100644
--- a/racket/src/thread/plumber.rkt
+++ b/racket/src/thread/plumber.rkt
@@ -11,7 +11,7 @@
 
 (struct plumber (callbacks ; hash table of handles -> callbacks
                  weak-callbacks) ; same, but weak references
-  #:property prop:authentic #t)
+  #:authentic)
 
 (define (make-plumber)
   (plumber (make-hasheq)
diff --git a/racket/src/thread/semaphore.rkt b/racket/src/thread/semaphore.rkt
index e6aba6c0cf..a58ff8769b 100644
--- a/racket/src/thread/semaphore.rkt
+++ b/racket/src/thread/semaphore.rkt
@@ -24,19 +24,19 @@
 
 (struct semaphore ([count #:mutable]
                    queue)
-        #:property
-        prop:evt
-        (poller (lambda (s poll-ctx)
-                  (semaphore-wait/poll s poll-ctx))))
+  #:property
+  prop:evt
+  (poller (lambda (s poll-ctx)
+            (semaphore-wait/poll s poll-ctx))))
 
 (struct semaphore-peek-evt (sema)
-        #:property
-        prop:evt
-        (poller (lambda (sp poll-ctx)
-                  (semaphore-wait/poll (semaphore-peek-evt-sema sp)
-                                       poll-ctx
-                                       #:peek? #t
-                                       #:result sp))))
+  #:property
+  prop:evt
+  (poller (lambda (sp poll-ctx)
+            (semaphore-wait/poll (semaphore-peek-evt-sema sp)
+                                 poll-ctx
+                                 #:peek? #t
+                                 #:result sp))))
 
 (struct semaphore-peek-select-waiter select-waiter ())
 
diff --git a/racket/src/thread/sync.rkt b/racket/src/thread/sync.rkt
index 97304bb420..52dc3c0bb6 100644
--- a/racket/src/thread/sync.rkt
+++ b/racket/src/thread/sync.rkt
@@ -8,7 +8,6 @@
          (submod "channel.rkt" for-sync)
          "thread.rkt"
          (only-in (submod "thread.rkt" scheduling)
-                  current-break-enabled-cell
                   thread-descheduled?)
          "schedule-info.rkt")
 
diff --git a/racket/src/thread/system-idle-evt.rkt b/racket/src/thread/system-idle-evt.rkt
index 7e973aa5c8..5ec00d5440 100644
--- a/racket/src/thread/system-idle-evt.rkt
+++ b/racket/src/thread/system-idle-evt.rkt
@@ -1,7 +1,6 @@
 #lang racket/base
 (require "evt.rkt"
-         "semaphore.rkt"
-         "internal-error.rkt")
+         "semaphore.rkt")
 
 (provide (rename-out [get-system-idle-evt system-idle-evt])
 
diff --git a/racket/src/thread/thread-group.rkt b/racket/src/thread/thread-group.rkt
index 7ab1162883..6ca155ccdf 100644
--- a/racket/src/thread/thread-group.rkt
+++ b/racket/src/thread/thread-group.rkt
@@ -1,6 +1,5 @@
 #lang racket/base
-(require "engine.rkt"
-         "check.rkt"
+(require "check.rkt"
          "internal-error.rkt"
          "atomic.rkt")
 
diff --git a/racket/src/thread/thread.rkt b/racket/src/thread/thread.rkt
index 536a67074d..51802079bc 100644
--- a/racket/src/thread/thread.rkt
+++ b/racket/src/thread/thread.rkt
@@ -117,12 +117,12 @@
                      [cpu-time #:mutable] ; accumulates CPU time in milliseconds
                      
                      [condition-wakeup #:mutable])
-        #:property prop:waiter
-        (make-waiter-methods 
-         #:suspend! (lambda (t i-cb r-cb) (thread-deschedule! t #f i-cb r-cb))
-         #:resume! (lambda (t v) (thread-reschedule! t) v))
-        #:property prop:evt (lambda (t) (wrap-evt (get-thread-dead-evt t)
-                                                  (lambda (v) t))))
+  #:property prop:waiter
+  (make-waiter-methods 
+   #:suspend! (lambda (t i-cb r-cb) (thread-deschedule! t #f i-cb r-cb))
+   #:resume! (lambda (t v) (thread-reschedule! t) v))
+  #:property prop:evt (lambda (t) (wrap-evt (get-thread-dead-evt t)
+                                            (lambda (v) t))))
 
 (define root-thread #f)
 
diff --git a/racket/src/thread/waiter.rkt b/racket/src/thread/waiter.rkt
index e82f7eac82..f64227044e 100644
--- a/racket/src/thread/waiter.rkt
+++ b/racket/src/thread/waiter.rkt
@@ -36,7 +36,7 @@
 ;; Used for semaphores and channels to run a "just selected" callback
 ;; when synchronized:
 (struct select-waiter (proc)
-        #:property prop:waiter
-        (make-waiter-methods #:suspend! (lambda args (internal-error "should not suspend a select-waiter"))
-                             #:resume! (lambda (w s)
-                                         ((select-waiter-proc w)))))
+  #:property prop:waiter
+  (make-waiter-methods #:suspend! (lambda args (internal-error "should not suspend a select-waiter"))
+                       #:resume! (lambda (w s)
+                                   ((select-waiter-proc w)))))