@@ -42,12 +42,11 @@
 		               *configdat*
 		               (begin
 		                 (debug:print 0 "ERROR: Called setup in a non-megatest area, exiting")
 		                 (exit 1)))))
 	  (runrec      (runs:runrec-make-record))
-	  (target      (or (args:get-arg "-reqtarg")
-		           (args:get-arg "-target")))
+	  (target      (common:args-get-target))
 	  (runname     (or (args:get-arg ":runname")
 		           (args:get-arg "-runname")))
 	  (testpatt    (or (args:get-arg "-testpatt")
 		           (args:get-arg "-runtests")))
 	  (keys        (keys:config-get-fields mconfig))
@@ -94,12 +93,11 @@
 			  (configf:get-section runconfig section)))
 	      (list "default" target))
     (vector target runname testpatt keys keyvals envdat mconfig runconfig serverdat transport db toppath run-id)))
 
 (define (set-megatest-env-vars run-id #!key (inkeys #f)(inrunname #f)(inkeyvals #f))
-  (let* ((target      (or (args:get-arg "-reqtarg")
-			  (args:get-arg "-target")
+  (let* ((target      (or (common:args-get-target)
 			  (get-environment-variable "MT_TARGET")))
 	 (keys    (if inkeys    inkeys    (cdb:remote-run db:get-keys #f)))
 	 (keyvals (if inkeyvals inkeyvals (keys:target->keyval keys target)))
 	 (vals (hash-table-ref/default *env-vars-by-run-id* run-id #f)))
     ;; get the info from the db and put it in the cache
@@ -1395,26 +1393,21 @@
 
 ;; Since many calls to a run require pretty much the same setup 
 ;; this wrapper is used to reduce the replication of code
 (define (general-run-call switchname action-desc proc)
   (let ((runname (args:get-arg ":runname"))
-	(target  (if (args:get-arg "-target")
-		     (args:get-arg "-target")
-		     (args:get-arg "-reqtarg"))))
-	;; (th1     #f))
+	(target  (common:args-get-target)))
     (cond
      ((not target)
       (debug:print 0 "ERROR: Missing required parameter for " switchname ", you must specify the target with -target")
       (exit 3))
      ((not runname)
       (debug:print 0 "ERROR: Missing required parameter for " switchname ", you must specify the run name with :runname runname")
       (exit 3))
      (else
       (let ((db   #f)
-	    (keys #f)
-	    (target (or (args:get-arg "-reqtarg")
-			(args:get-arg "-target"))))
+	    (keys #f))
 	(if (not (setup-for-run))
 	    (begin 
 	      (debug:print 0 "Failed to setup, exiting")
 	      (exit 1)))
 	;; (if (args:get-arg "-server")