@@ -22,13 +22,13 @@
 ;; fake out readline usage of toplevel-command
 (define (toplevel-command . a) #f)
 
 (declare (uses common))
 ;; (declare (uses megatest-version))
-(declare (uses margs))
-(declare (uses mtargs))
-(declare (uses mtargs.import))
+;; (declare (uses margs))
+;; (declare (uses mtargs))
+;; (declare (uses mtargs.import))
 (declare (uses commonmod))
 (declare (uses commonmod.import))
 (declare (uses mtargs))
 (declare (uses mtargs.import))
 (declare (uses debugprint))
@@ -64,11 +64,11 @@
 ;; (declare (uses debugprint.import))
 
 ;; (declare (uses ftail))
 ;; (import ftail)
 
-(import mtargs
+(import (prefix mtargs args:)
         debugprint
 	dbmod
 	commonmod
 	dbfile
 	tcp-transportmod
@@ -678,11 +678,11 @@
 		       (process:children #f))
 		      (original-exit exit-code)))))
 
 ;; for some switches always print the command to stderr
 ;;
-(if (args:any? "-run" "-runall" "-remove-runs" "-set-state-status" "-kill-runs" "-kill-rerun")
+(if (args:any-defined? "-run" "-runall" "-remove-runs" "-set-state-status" "-kill-runs" "-kill-rerun")
     (debug:print 0 *default-log-port* (string-intersperse (argv) " ")))
 
 
 ;;======================================================================
 ;; Misc setup stuff