diff --git a/collects/mred/mred.ss b/collects/mred/mred.ss
index 9d234a4e..15f00c9a 100644
--- a/collects/mred/mred.ss
+++ b/collects/mred/mred.ss
@@ -7705,6 +7705,11 @@
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
+(define mred-module-name ((current-module-name-resolver)
+			  '(lib "mred.ss" "mred") #f #f))
+(define class-module-name ((current-module-name-resolver)
+			   '(lib "class.ss") #f #f))
+
 (define make-namespace-with-mred
   (opt-lambda ([flag 'mred])
     (unless (memq flag '(initial mred empty))
@@ -7712,14 +7717,12 @@
 			"flag symbol, one of 'mred, 'initial, or 'empty"
 			flag))
     (let ([orig (current-namespace)]
-	  [mred-name ((current-module-name-resolver)
-		      '(lib "mred.ss" "mred") #f #f)]
 	  [ns (make-namespace (if (eq? flag 'empty) 'empty 'initial))])
       (parameterize ([current-namespace ns])
-	(namespace-attach-module orig mred-name)
+	(namespace-attach-module orig mred-module-name)
 	(when (eq? flag 'mred)
-	  (namespace-require '(lib "mred.ss" "mred"))
-	  (namespace-require '(lib "class.ss"))))
+	  (namespace-require mred-module-name)
+	  (namespace-require class-module-name)))
       ns)))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;