@@ -2303,21 +2303,21 @@
 	  (begin
 	    (debug:print 0 *default-log-port* "Failed to setup, exiting") 
 	    (exit 1)))
       ;; keep this one local
       ;; (open-run-close patch-db #f)
-      (let ((dbstructs (db:setup #f *toppath*)))
+      (let ((dbstructs (db:setup #f)))
         (common:cleanup-db dbstructs full: #t))
       (set! *didsomething* #t)))
 
 (if (args:get-arg "-cleanup-db")
     (begin
       (if (not (launch:setup))
 	  (begin
 	    (debug:print 0 *default-log-port* "Failed to setup, exiting") 
 	    (exit 1)))
-      (let ((dbstructs (db:setup #f *toppath*)))
+      (let ((dbstructs (db:setup #f)))
         (common:cleanup-db dbstructs))
       (set! *didsomething* #t)))
 
 (if (args:get-arg "-mark-incompletes")
     (begin
@@ -2372,11 +2372,11 @@
 	(args:get-arg "-repl")
 	(args:get-arg "-load"))
     (let* ((toppath (launch:setup))
 	   (dbstructs (if (and toppath
                                (common:on-homehost?))
-                          (dbfile:setup #t toppath)
+                          (db:setup #t)
                           #f))) ;; make-dbr:dbstruct path: toppath local: (args:get-arg "-local")) #f)))
       (if *toppath*
 	  (cond
 	   ((getenv "MT_RUNSCRIPT")
 	    ;; How to run megatest scripts
@@ -2463,11 +2463,11 @@
 
 (if (args:get-arg "-import-megatest.db")
     (begin
       (launch:setup)
       (db:multi-db-sync 
-       (db:setup #f *toppath*)
+       (db:setup #f)
        'killservers
        'dejunk
        'adj-testids
        'old2new
        ;; 'new2old
@@ -2474,11 +2474,11 @@
        )
       (set! *didsomething* #t)))
 
 (when (args:get-arg "-sync-brute-force")
   (launch:setup)
-  ((server:get-bruteforce-syncer (db:setup #t *toppath*) persist-until-sync: #t))
+  ((server:get-bruteforce-syncer (db:setup #t) persist-until-sync: #t))
   (set! *didsomething* #t))
 
 (if (args:get-arg "-sync-to-megatest.db")
     (let* ((duh      (launch:setup))
 	   (dbstruct (db:setup #f))