@@ -22,12 +22,11 @@
 ;; fake out readline usage of toplevel-command
 (define (toplevel-command . a) #f)
 
 (use (prefix sqlite3 sqlite3:) srfi-1 posix regex regex-case srfi-69 (prefix base64 base64:)
      readline apropos json http-client directory-utils typed-records
-     http-client srfi-18 extras format
-     )
+     http-client srfi-18 extras format)
 
 ;; Added for csv stuff - will be removed
 ;;
 (use sparse-vectors)
 
@@ -701,17 +700,17 @@
 		       (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) " ")))
 
 ;; some switches imply homehost. Exit here if not on homehost
 ;;
 (let ((homehost-required  (list "-cleanup-db" "-server")))
-  (if (apply args:any? homehost-required)
+  (if (apply args:any-defined? homehost-required)
       (if (not (common:on-homehost?))
 	  (for-each
 	   (lambda (switch)
 	     (if (args:get-arg switch)
 		 (begin