diff --git a/Makefile b/Makefile
index 36d7138928..3fb2ba0c9a 100644
--- a/Makefile
+++ b/Makefile
@@ -268,16 +268,8 @@ cs-in-place:
 	$(MAKE) cs
 
 cs-base:
-	if [ "$(CPUS)" = "" ] ; \
-         then $(MAKE) plain-cs-base ; \
-         else $(MAKE) cpus-cs-base CPUS="$(CPUS)" ; fi
-
-plain-cs-base:
 	$(MAKE) cs CS_SETUP_TARGET=nothing-after-base
 
-cpus-cs-base:
-	$(MAKE) -j $(CPUS) plain-cs-base JOB_OPTIONS="-j $(CPUS)"
-
 cs-as-is:
 	$(MAKE) cs BASE_TARGET=plain-base CS_SETUP_TARGET=in-place-setup
 
@@ -622,11 +614,16 @@ binary-catalog-server:
 # keep the "build/user" directory on the grounds that the
 # client is the same as the server.
 
+# These can get replaced by `cs-base` and `win32-cs-base`:
+CLIENT_BASE = base
+WIN32_CLIENT_BASE = win32-base
+
 PROP_ARGS = SERVER=$(SERVER) SERVER_PORT=$(SERVER_PORT) SERVER_HOSTS="$(SERVER_HOSTS)" \
             PKGS="$(PKGS)" PLAIN_RACKET="$(PLAIN_RACKET)" BUILD_STAMP="$(BUILD_STAMP)" \
 	    RELEASE_MODE=$(RELEASE_MODE) SOURCE_MODE=$(SOURCE_MODE) \
             VERSIONLESS_MODE=$(VERSIONLESS_MODE) MAC_PKG_MODE=$(MAC_PKG_MODE) \
             PKG_SOURCE_MODE="$(PKG_SOURCE_MODE)" INSTALL_NAME="$(INSTALL_NAME)" \
+            UNPACK_COLLECTS_FLAGS="$(UNPACK_COLLECTS_FLAGS)" \
             DIST_NAME="$(DIST_NAME)" DIST_BASE=$(DIST_BASE) \
             DIST_DIR=$(DIST_DIR) DIST_SUFFIX=$(DIST_SUFFIX) UPLOAD="$(UPLOAD)" \
             DIST_DESC="$(DIST_DESC)" README="$(README)" SIGN_IDENTITY="$(SIGN_IDENTITY)" \
@@ -642,7 +639,7 @@ SET_BUNDLE_CONFIG_q = $(BUNDLE_CONFIG) "$(INSTALL_NAME)" "$(BUILD_STAMP)" "$(DOC
 
 client:
 	if [ ! -d build/log ] ; then rm -rf build/user ; fi
-	$(MAKE) base $(COPY_ARGS)
+	$(MAKE) $(CLIENT_BASE) $(COPY_ARGS)
 	$(MAKE) distro-build-from-server $(COPY_ARGS)
 	$(MAKE) bundle-from-server $(COPY_ARGS)
 	$(USER_RACKET) -l distro-build/set-config $(SET_BUNDLE_CONFIG_q)
@@ -650,7 +647,7 @@ client:
 
 win32-client:
 	IF EXIST build\user cmd /c del /f /s /q build\user
-	$(MAKE) win32-base $(COPY_ARGS)
+	$(MAKE) $(WIN32_CLIENT_BASE) $(COPY_ARGS)
 	$(MAKE) win32-distro-build-from-server $(COPY_ARGS)
 	$(MAKE) win32-bundle-from-server $(COPY_ARGS)
 	$(WIN32_RACKET) -l distro-build/set-config $(SET_BUNDLE_CONFIG_q)
@@ -674,7 +671,7 @@ bundle-from-server:
 	$(USER_RACKET) -l setup/unixstyle-install bundle racket bundle/racket
 	$(USER_RACKET) -l setup/winstrip bundle/racket
 	$(USER_RACKET) -l setup/winvers-change bundle/racket
-	$(USER_RACKET) -l distro-build/unpack-collects http://$(SVR_PRT)/$(SERVER_COLLECTS_PATH)
+	$(USER_RACKET) -l distro-build/unpack-collects $(UNPACK_COLLECTS_FLAGS) http://$(SVR_PRT)/$(SERVER_COLLECTS_PATH)
 	$(BUNDLE_RACO) pkg install $(REMOTE_INST_AUTO) $(PKG_SOURCE_MODE) $(REQUIRED_PKGS)
 	$(BUNDLE_RACO) pkg install $(REMOTE_INST_AUTO) $(PKG_SOURCE_MODE) $(PKGS)
 	$(USER_RACKET) -l setup/unixstyle-install post-adjust "$(SOURCE_MODE)" "$(PKG_SOURCE_MODE)" racket bundle/racket
diff --git a/racket/src/cs/main.sps b/racket/src/cs/main.sps
index 3929d1a990..779713031e 100644
--- a/racket/src/cs/main.sps
+++ b/racket/src/cs/main.sps
@@ -161,12 +161,12 @@
                                      "gui-interactive.rkt"
                                      "interactive.rkt"))])
               (and (file-exists? p) p))
-            (hash-ref (call-with-input-file
-                       (build-path (find-main-config) "config.rktd")
-                       read)
-                      (if gracket? 'gui-interactive-file 'interactive-file)
-                      #f)
-            (if gracket? 'racket/interactive 'racket/gui/interactive)))
+            (let ([config-fn (build-path (find-main-config) "config.rktd")])
+              (and (file-exists? config-fn)
+                   (hash-ref (call-with-input-file config-fn read)
+                             (if gracket? 'gui-interactive-file 'interactive-file)
+                             #f)))
+            (if gracket? 'racket/gui/interactive 'racket/interactive)))
       (default-continuation-prompt-tag)
       (lambda args #f)))
 
@@ -321,7 +321,7 @@
               (flags-loop (cdr args) (see saw 'non-config))]
              [("-v" "--version") 
               (set! version? #t)
-              (flags-loop (cddr args) (see saw 'non-config))]
+              (flags-loop (cdr args) (see saw 'non-config))]
              [("-c" "--no-compiled")
               (set! compiled-file-paths '())
               (loop (cdr args))]
@@ -553,7 +553,7 @@
           (apply orig args)))))
 
    (when version?
-     (printf "Welcome to Racket v~a [cs]\n" (version)))
+     (printf "Welcome to Racket v~a [cs].\n" (version)))
    (call-in-main-thread
     (lambda ()
       (initialize-place!)