Index: utils/plot-code.scm
==================================================================
--- utils/plot-code.scm
+++ utils/plot-code.scm
@@ -5,21 +5,26 @@
 ;;        dot -Tpdf plot.dot > plot.pdf
 ;; first param is comma separated list of files to include in the map, use - to do all
 ;; second param is list of regexs for functions to include in the map
 ;; third param is list of files to scan
 
-(use regex srfi-69 srfi-13)
+(use regex srfi-69 srfi-13 srfi-1 data-structures posix)
+
+;;                 1                   2        remainder
+;; plot-code file1.scm,file2.scm... fn-regex file1.scm file2.scm ...
+
+(define targs #f)
 
-(define targs #f) 
-(define files (cdr (cddddr (argv))))
+(define args (argv))
+(define files (cdddr args))
 
-(let ((targdat (cadddr (argv))))
+(let ((targdat (cadr args)))
   (if (equal? targdat "-")
       (set! targs files)
       (set! targs (string-split targdat ","))))
 
-(define function-patt (car (cdr (cdddr (argv)))))
+(define function-patt (caddr args))
 (define function-rx   (regexp function-patt))
 (define filedat-defns (make-hash-table))
 (define filedat-usages (make-hash-table))
 
 (define defn-rx (regexp "^\\s*\\(define\\s+\\(([^\\s\\)]+).*"))