diff --git a/racket/collects/raco/command-name.rkt b/racket/collects/raco/command-name.rkt
index 5cbe917428..754d3a6b34 100644
--- a/racket/collects/raco/command-name.rkt
+++ b/racket/collects/raco/command-name.rkt
@@ -10,24 +10,25 @@
 
   (define-values (program+command-name)
     (lambda ()
-      (let-values ([(p) (find-system-path 'run-file)]
-                   [(n) (current-command-name)])
-        (if n
-            (format "~a ~a" p n)
-            p))))
-  
+      (define-values (p) (find-system-path 'run-file))
+      (define-values (n) (current-command-name))
+      (if n (format "~a ~a" p n) p)))
+
   (define-values (short-program+command-name)
     (lambda ()
-      (let-values ([(p) (find-system-path 'run-file)]
-                   [(n) (current-command-name)])
-        (let-values ([(base name dir?) (split-path p)])
-          (let-values ([(name) (if (eq? (system-type) 'windows)
-                                   (string->path-element
-                                    (regexp-replace #rx"(?i:[.]exe)$"
-                                                    (path-element->string name)
-                                                    ""))
-                                   name)])
-            (if n
-                (format "~a ~a" name n)
-                (path->string name))))))))
+      (define-values (p) (find-system-path 'run-file))
+      (define-values (n) (current-command-name))
+      (define-values (base name dir?) (split-path p))
+      (define-values (converted-name) (convert-name name))
+      (if n
+          (format "~a ~a" converted-name n)
+          (path->string converted-name))))
 
+  (define-values (convert-name)
+    (lambda (name)
+      (if (eq? (system-type) 'windows)
+          (string->path-element
+           (regexp-replace #rx"(?i:[.]exe)$"
+                           (path-element->string name)
+                           ""))
+          name))))