@@ -11,12 +11,11 @@
 (include "common_records.scm")
 
 (define (setup-env-defaults fname run-id already-seen keyvals #!key (environ-patt #f)(change-env #t))
   (let* ((keys    (map car keyvals))
 	 (thekey  (if keyvals (string-intersperse (map (lambda (x)(if x x "-na-")) (map cadr keyvals)) "/")
-		      (or (args:get-arg "-reqtarg") 
-			  (args:get-arg "-target")
+		      (or (common:args-get-target)
 			  (get-environment-variable "MT_TARGET")
 			  (begin
 			    (debug:print 0 "ERROR: setup-env-defaults called with no run-id or -target or -reqtarg")
 			    "nothing matches this I hope"))))
 	 ;; Why was system disallowed in the reading of the runconfigs file?
@@ -60,12 +59,11 @@
     finaldat))
 
 (define (set-run-config-vars run-id keyvals targ-from-db)
   (push-directory *toppath*) ;; the push/pop doesn't appear to do anything ...
   (let ((runconfigf (conc  *toppath* "/runconfigs.config"))
-	(targ       (or (args:get-arg "-target")
-			(args:get-arg "-reqtarg")
+	(targ       (or (common:args-get-target)
 			targ-from-db
 			(get-environment-variable "MT_TARGET"))))
     (pop-directory)
     (if (file-exists? runconfigf)
 	(setup-env-defaults runconfigf run-id #t keyvals