Index: megatest.scm
==================================================================
--- megatest.scm
+++ megatest.scm
@@ -641,13 +641,11 @@
 ;; handle a clean-cache request as early as possible
 ;;
 (if (args:get-arg "-clean-cache")
     (let ((toppath  (launch:setup)))
       (set! *didsomething* #t) ;; suppress the help output.
-      (runs:clean-cache (or (getenv "MT_TARGET")
-			    (args:get-arg "-target")
-			    (args:get-arg "-remtarg"))
+      (runs:clean-cache (common:args-get-target)
 			(args:get-arg "-runname")
 			toppath)))
 	  
 (if (args:get-arg "-env2file")
     (begin
@@ -1083,11 +1081,11 @@
      (lambda (target runname keys keyvals)
        (operate-on 'kill-runs mode: #f)
        )))
 
 (if (args:get-arg "-kill-rerun")
-    (let* ((target-patt (args:get-arg "-target"))
+    (let* ((target-patt (common:args-get-target))
            (runname-patt (args:get-arg "-runname")))
       (cond ((not target-patt)
              (debug:print-error 0 *default-log-port* "Missing target, must specify target for -kill-rerun with -target <target name>")
              (exit 1))
             ((not runname-patt)
@@ -1826,11 +1824,12 @@
 	       (db-host   (assoc/default 'db-host   cmdinfo))
 	       (run-id    (assoc/default 'run-id    cmdinfo))
 	       (itemdat   (assoc/default 'itemdat   cmdinfo))
 	       (state     (args:get-arg ":state"))
 	       (status    (args:get-arg ":status"))
-	       (target    (args:get-arg "-target"))
+	       ;;(target    (args:get-arg "-target"))
+	       (target    (common:args-get-target))
 	       (toppath   (assoc/default 'toppath   cmdinfo)))
 	  (change-directory toppath)
 	  (if (not target)
 	      (begin
 		(debug:print-error 0 *default-log-port* "-target is required.")