Index: archive.scm
==================================================================
--- archive.scm
+++ archive.scm
@@ -21,10 +21,13 @@
 (use (prefix sqlite3 sqlite3:) srfi-1 posix regex regex-case srfi-69 format md5 message-digest srfi-18)
 
 (declare (unit archive))
 (declare (uses db))
 (declare (uses common))
+
+(declare (uses commonmod))
+(import commonmod)
 
 (include "common_records.scm")
 (include "db_records.scm")
 
 ;;======================================================================

Index: client.scm
==================================================================
--- client.scm
+++ client.scm
@@ -27,10 +27,13 @@
 (declare (unit client))
 
 (declare (uses common))
 (declare (uses db))
 (declare (uses tasks)) ;; tasks are where stuff is maintained about what is running.
+
+(declare (uses commonmod))
+(import commonmod)
 
 (include "common_records.scm")
 (include "db_records.scm")
 
 ;; client:get-signature

Index: common.scm
==================================================================
--- common.scm
+++ common.scm
@@ -26,12 +26,12 @@
      (prefix sqlite3 sqlite3:)
      pkts (prefix dbi dbi:)
      )
 
 (declare (unit common))
-;; (declare (uses commonmod))
-;; (import commonmod)
+(declare (uses commonmod))
+(import commonmod)
 
 (include "common_records.scm")
 
 
 ;; (require-library margs)

Index: common_records.scm
==================================================================
--- common_records.scm
+++ common_records.scm
@@ -77,177 +77,176 @@
   (mutex-lock! mtx)
   (let ((res (apply accessor record val)))
     (mutex-unlock! mtx)
     res))
 
-;; this was cached based on results from profiling but it turned out the profiling
-;; somehow went wrong - perhaps too many processes writing to it. Leaving the caching
-;; in for now but can probably take it out later.
-;;
-(define (debug:calc-verbosity vstr)
-  (or (hash-table-ref/default *verbosity-cache* vstr #f)
-      (let ((res (cond
-                  ((number? vstr) vstr)
-                  ((not (string?  vstr))   1)
-                  ;; ((string-match  "^\\s*$" vstr) 1)
-                  (vstr           (let ((debugvals  (filter number? (map string->number (string-split vstr ",")))))
-                                    (cond
-                                     ((> (length debugvals) 1) debugvals)
-                                     ((> (length debugvals) 0)(car debugvals))
-                                     (else 1))))
-                  ((args:get-arg "-v")   2)
-                  ((args:get-arg "-q")    0)
-                  (else                   1))))
-        (hash-table-set! *verbosity-cache* vstr res)
-        res)))
-
-;; check verbosity, #t is ok
-(define (debug:check-verbosity verbosity vstr)
-  (if (not (or (number? verbosity)
-	       (list?   verbosity)))
-      (begin
-	(print "ERROR: Invalid debug value \"" vstr "\"")
-	#f)
-      #t))
-
-(define (debug:debug-mode n)
-  (cond
-   ((and (number? *verbosity*)   ;; number number
-	 (number? n))
-    (<= n *verbosity*))
-   ((and (list? *verbosity*)     ;; list   number
-	 (number? n))
-    (member n *verbosity*))
-   ((and (list? *verbosity*)     ;; list   list
-	 (list? n))
-    (not (null? (lset-intersection! eq? *verbosity* n))))
-   ((and (number? *verbosity*)
-	 (list? n))
-    (member *verbosity* n))))
-
-(define (debug:setup)
-  (let ((debugstr (or (args:get-arg "-debug")
-		      (args:get-arg "-debug-noprop")
-		      (getenv "MT_DEBUG_MODE"))))
-    (set! *verbosity* (debug:calc-verbosity debugstr))
-    (debug:check-verbosity *verbosity* debugstr)
-    ;; if we were handed a bad verbosity rule then we will override it with 1 and continue
-    (if (not *verbosity*)(set! *verbosity* 1))
-    (if (and (not (args:get-arg "-debug-noprop"))
-	     (or (args:get-arg "-debug")
-		 (not (getenv "MT_DEBUG_MODE"))))
-	(setenv "MT_DEBUG_MODE" (if (list? *verbosity*)
-				    (string-intersperse (map conc *verbosity*) ",")
-				    (conc *verbosity*))))))
-  
-(define (debug:print n e . params)
-  (if (debug:debug-mode n)
-      (with-output-to-port (or e (current-error-port))
-	(lambda ()
-	  (if *logging*
-	      (db:log-event (apply conc params))
-	      (apply print params)
-	      )))))
-
-;; Brandon's debug printer shortcut (indulge me :)
-(define *BB-process-starttime* (current-milliseconds))
-(define (BB> . in-args)
-  (let* ((stack (get-call-chain))
-         (location "??"))
-    (for-each
-     (lambda (frame)
-       (let* ((this-loc (vector-ref frame 0))
-              (temp     (string-split (->string this-loc) " "))
-              (this-func (if (and (list? temp) (> (length temp) 1)) (cadr temp) "???")))
-         (if (equal? this-func "BB>")
-             (set! location this-loc))))
-     stack)
-    (let* ((color-on "\x1b[1m")
-           (color-off "\x1b[0m")
-           (dp-args
-            (append
-             (list 0 *default-log-port*
-                   (conc color-on location "@"(/ (- (current-milliseconds) *BB-process-starttime*) 1000) color-off "   ")  )
-             in-args)))
-      (apply debug:print dp-args))))
-
-(define *BBpp_custom_expanders_list* (make-hash-table))
-
-
-
-;; register hash tables with BBpp.
-(hash-table-set! *BBpp_custom_expanders_list* HASH_TABLE:
-                 (cons hash-table? hash-table->alist))
-
-;; test name converter
-(define (BBpp_custom_converter arg)
-  (let ((res #f))
-    (for-each
-     (lambda (custom-type-name)
-       (let* ((custom-type-info      (hash-table-ref *BBpp_custom_expanders_list* custom-type-name))
-              (custom-type-test      (car custom-type-info))
-              (custom-type-converter (cdr custom-type-info)))
-         (when (and (not res) (custom-type-test arg))
-           (set! res (custom-type-converter arg)))))
-     (hash-table-keys *BBpp_custom_expanders_list*))
-    (if res (BBpp_ res) arg)))
-
-(define (BBpp_ arg)
-  (cond
-   ;;((SOMESTRUCT? arg) (cons SOMESTRUCT: (SOMESTRUCT->alist arg)))
-   ;;((dboard:tabdat? arg) (cons dboard:tabdat: (dboard:tabdat->alist arg)))
-   ((hash-table? arg)
-    (let ((al (hash-table->alist arg)))
-      (BBpp_ (cons HASH_TABLE: al))))
-   ((null? arg) '())
-   ;;((list? arg) (cons (BBpp_ (car arg)) (BBpp_ (cdr arg))))
-   ((pair? arg) (cons (BBpp_ (car arg)) (BBpp_ (cdr arg))))
-   (else (BBpp_custom_converter arg))))
-
-;; Brandon's pretty printer.  It expands hashes and custom types in addition to regular pp
-(define (BBpp arg)
-  (pp (BBpp_ arg)))
-
-;(use define-macro)
-(define-syntax inspect
-  (syntax-rules ()
-    [(_ x)
-    ;; (with-output-to-port (current-error-port)
-       (printf "~a is: ~a\n" 'x (with-output-to-string (lambda () (BBpp x))))
-     ;;  )
-     ]
-    [(_ x y ...) (begin (inspect x) (inspect y ...))]))
-
-(define (debug:print-error n e . params)
-  ;; normal print
-  (if (debug:debug-mode n)
-      (with-output-to-port (if (port? e) e (current-error-port))
-	(lambda ()
-	  (if *logging*
-	      (db:log-event (apply conc params))
-	      ;; (apply print "pid:" (current-process-id) " " params)
-	      (apply print "ERROR: " params)
-	      ))))
-  ;; pass important messages to stderr
-  (if (and (eq? n 0)(not (eq? e (current-error-port)))) 
-      (with-output-to-port (current-error-port)
-	(lambda ()
-	  (apply print "ERROR: " params)
-	  ))))
-
-(define (debug:print-info n e . params)
-  (if (debug:debug-mode n)
-      (with-output-to-port (if (port? e) e (current-error-port))
-	(lambda ()
-	  (if *logging*
-	      (let ((res (format#format #f "INFO: (~a) ~a" n (apply conc params))))
-		(db:log-event res))
-	      ;; (apply print "pid:" (current-process-id) " " "INFO: (" n ") " params) ;; res)
-	      (apply print "INFO: (" n ") " params) ;; res)
-	      )))))
-
-
+;; ;; this was cached based on results from profiling but it turned out the profiling
+;; ;; somehow went wrong - perhaps too many processes writing to it. Leaving the caching
+;; ;; in for now but can probably take it out later.
+;; ;;
+;; (define (debug:calc-verbosity vstr)
+;;   (or (hash-table-ref/default *verbosity-cache* vstr #f)
+;;       (let ((res (cond
+;;                   ((number? vstr) vstr)
+;;                   ((not (string?  vstr))   1)
+;;                   ;; ((string-match  "^\\s*$" vstr) 1)
+;;                   (vstr           (let ((debugvals  (filter number? (map string->number (string-split vstr ",")))))
+;;                                     (cond
+;;                                      ((> (length debugvals) 1) debugvals)
+;;                                      ((> (length debugvals) 0)(car debugvals))
+;;                                      (else 1))))
+;;                   ((args:get-arg "-v")   2)
+;;                   ((args:get-arg "-q")    0)
+;;                   (else                   1))))
+;;         (hash-table-set! *verbosity-cache* vstr res)
+;;         res)))
+;; 
+;; ;; check verbosity, #t is ok
+;; (define (debug:check-verbosity verbosity vstr)
+;;   (if (not (or (number? verbosity)
+;; 	       (list?   verbosity)))
+;;       (begin
+;; 	(print "ERROR: Invalid debug value \"" vstr "\"")
+;; 	#f)
+;;       #t))
+;; 
+;; (define (debug:debug-mode n)
+;;   (cond
+;;    ((and (number? *verbosity*)   ;; number number
+;; 	 (number? n))
+;;     (<= n *verbosity*))
+;;    ((and (list? *verbosity*)     ;; list   number
+;; 	 (number? n))
+;;     (member n *verbosity*))
+;;    ((and (list? *verbosity*)     ;; list   list
+;; 	 (list? n))
+;;     (not (null? (lset-intersection! eq? *verbosity* n))))
+;;    ((and (number? *verbosity*)
+;; 	 (list? n))
+;;     (member *verbosity* n))))
+;; 
+;; (define (debug:setup)
+;;   (let ((debugstr (or (args:get-arg "-debug")
+;; 		      (args:get-arg "-debug-noprop")
+;; 		      (getenv "MT_DEBUG_MODE"))))
+;;     (set! *verbosity* (debug:calc-verbosity debugstr))
+;;     (debug:check-verbosity *verbosity* debugstr)
+;;     ;; if we were handed a bad verbosity rule then we will override it with 1 and continue
+;;     (if (not *verbosity*)(set! *verbosity* 1))
+;;     (if (and (not (args:get-arg "-debug-noprop"))
+;; 	     (or (args:get-arg "-debug")
+;; 		 (not (getenv "MT_DEBUG_MODE"))))
+;; 	(setenv "MT_DEBUG_MODE" (if (list? *verbosity*)
+;; 				    (string-intersperse (map conc *verbosity*) ",")
+;; 				    (conc *verbosity*))))))
+;;   
+;; (define (debug:print n e . params)
+;;   (if (debug:debug-mode n)
+;;       (with-output-to-port (or e (current-error-port))
+;; 	(lambda ()
+;; 	  (if *logging*
+;; 	      (db:log-event (apply conc params))
+;; 	      (apply print params)
+;; 	      )))))
+;; 
+;; ;; Brandon's debug printer shortcut (indulge me :)
+;; (define *BB-process-starttime* (current-milliseconds))
+;; (define (BB> . in-args)
+;;   (let* ((stack (get-call-chain))
+;;          (location "??"))
+;;     (for-each
+;;      (lambda (frame)
+;;        (let* ((this-loc (vector-ref frame 0))
+;;               (temp     (string-split (->string this-loc) " "))
+;;               (this-func (if (and (list? temp) (> (length temp) 1)) (cadr temp) "???")))
+;;          (if (equal? this-func "BB>")
+;;              (set! location this-loc))))
+;;      stack)
+;;     (let* ((color-on "\x1b[1m")
+;;            (color-off "\x1b[0m")
+;;            (dp-args
+;;             (append
+;;              (list 0 *default-log-port*
+;;                    (conc color-on location "@"(/ (- (current-milliseconds) *BB-process-starttime*) 1000) color-off "   ")  )
+;;              in-args)))
+;;       (apply debug:print dp-args))))
+;; 
+;; (define *BBpp_custom_expanders_list* (make-hash-table))
+;; 
+;; 
+;; 
+;; ;; register hash tables with BBpp.
+;; (hash-table-set! *BBpp_custom_expanders_list* HASH_TABLE:
+;;                  (cons hash-table? hash-table->alist))
+;; 
+;; ;; test name converter
+;; (define (BBpp_custom_converter arg)
+;;   (let ((res #f))
+;;     (for-each
+;;      (lambda (custom-type-name)
+;;        (let* ((custom-type-info      (hash-table-ref *BBpp_custom_expanders_list* custom-type-name))
+;;               (custom-type-test      (car custom-type-info))
+;;               (custom-type-converter (cdr custom-type-info)))
+;;          (when (and (not res) (custom-type-test arg))
+;;            (set! res (custom-type-converter arg)))))
+;;      (hash-table-keys *BBpp_custom_expanders_list*))
+;;     (if res (BBpp_ res) arg)))
+;; 
+;; (define (BBpp_ arg)
+;;   (cond
+;;    ;;((SOMESTRUCT? arg) (cons SOMESTRUCT: (SOMESTRUCT->alist arg)))
+;;    ;;((dboard:tabdat? arg) (cons dboard:tabdat: (dboard:tabdat->alist arg)))
+;;    ((hash-table? arg)
+;;     (let ((al (hash-table->alist arg)))
+;;       (BBpp_ (cons HASH_TABLE: al))))
+;;    ((null? arg) '())
+;;    ;;((list? arg) (cons (BBpp_ (car arg)) (BBpp_ (cdr arg))))
+;;    ((pair? arg) (cons (BBpp_ (car arg)) (BBpp_ (cdr arg))))
+;;    (else (BBpp_custom_converter arg))))
+;; 
+;; ;; Brandon's pretty printer.  It expands hashes and custom types in addition to regular pp
+;; (define (BBpp arg)
+;;   (pp (BBpp_ arg)))
+;; 
+;; ;(use define-macro)
+;; (define-syntax inspect
+;;   (syntax-rules ()
+;;     [(_ x)
+;;     ;; (with-output-to-port (current-error-port)
+;;        (printf "~a is: ~a\n" 'x (with-output-to-string (lambda () (BBpp x))))
+;;      ;;  )
+;;      ]
+;;     [(_ x y ...) (begin (inspect x) (inspect y ...))]))
+;; 
+;; (define (debug:print-error n e . params)
+;;   ;; normal print
+;;   (if (debug:debug-mode n)
+;;       (with-output-to-port (if (port? e) e (current-error-port))
+;; 	(lambda ()
+;; 	  (if *logging*
+;; 	      (db:log-event (apply conc params))
+;; 	      ;; (apply print "pid:" (current-process-id) " " params)
+;; 	      (apply print "ERROR: " params)
+;; 	      ))))
+;;   ;; pass important messages to stderr
+;;   (if (and (eq? n 0)(not (eq? e (current-error-port)))) 
+;;       (with-output-to-port (current-error-port)
+;; 	(lambda ()
+;; 	  (apply print "ERROR: " params)
+;; 	  ))))
+;; 
+;; (define (debug:print-info n e . params)
+;;   (if (debug:debug-mode n)
+;;       (with-output-to-port (if (port? e) e (current-error-port))
+;; 	(lambda ()
+;; 	  (if *logging*
+;; 	      (let ((res (format#format #f "INFO: (~a) ~a" n (apply conc params))))
+;; 		(db:log-event res))
+;; 	      ;; (apply print "pid:" (current-process-id) " " "INFO: (" n ") " params) ;; res)
+;; 	      (apply print "INFO: (" n ") " params) ;; res)
+;; 	      )))))
+;; 
 
 ;; if a value is printable (i.e. string or number) return the value
 ;; else return an empty string
 (define-inline (printable val)
   (if (or (number? val)(string? val)) val ""))

Index: commonmod.scm
==================================================================
--- commonmod.scm
+++ commonmod.scm
@@ -24,11 +24,12 @@
 	*
 	
 (import scheme chicken data-structures extras files ports)
 (import (prefix sqlite3 sqlite3:) posix typed-records srfi-18 srfi-69
 	md5 message-digest
-	regex srfi-1)
+	regex srfi-1
+	format)
 
 ;;======================================================================
 ;; CONTENTS
 ;;
 ;;  config file utils
@@ -167,11 +168,11 @@
 
 ;; this was cached based on results from profiling but it turned out the profiling
 ;; somehow went wrong - perhaps too many processes writing to it. Leaving the caching
 ;; in for now but can probably take it out later.
 ;;
-(define (debug-calc-verbosity vstr arg) ;; arg is 'v (verbose) or 'q (quiet)
+(define (debug:calc-verbosity vstr arg) ;; arg is 'v (verbose) or 'q (quiet)
   (let* ((res (cond
 	       ((number? vstr) vstr)
 	       ((not (string?  vstr))   1)
 	       ;; ((string-match  "^\\s*$" vstr) 1)
 	       (vstr           (let ((debugvals  (filter number? (map string->number (string-split vstr ",")))))
@@ -192,11 +193,11 @@
       (begin
 	(print "ERROR: Invalid debug value \"" vstr "\"")
 	#f)
       #t))
 
-(define (debug-debug-mode n)
+(define (debug:debug-mode n)
   (let* ((vb (verbosity)))
     (cond
    ((and (number? vb)   ;; number number
 	 (number? n))
     (<= n vb))
@@ -208,15 +209,15 @@
     (not (null? (lset-intersection! eq? vb n))))
    ((and (number? vb)
 	 (list? n))
     (member vb n)))))
 
-(define (debug-setup debug-arg) ;; debug-arg= #f, #t or 'noprop
+(define (debug:setup debug-arg) ;; debug-arg= #f, #t or 'noprop
   (let ((debugstr (or debug-arg ;; (args:get-arg "-debug")
 		      ;; (args:get-arg "-debug-noprop")
 		      (get-environment-variable "MT_DEBUG_MODE"))))
-    (debug-calc-verbosity debugstr)
+    (debug:calc-verbosity debugstr)
     ;; (debug:check-verbosity *verbosity* debugstr)
     ;; if we were handed a bad verbosity rule then we will override it with 1 and continue
     (if (not (verbosity))(set! (verbosity) 1))
     (if (and (not (eq? debug-arg 'noprop))
 	     (or debug-arg
@@ -223,14 +224,36 @@
 		 (not (get-environment-variable "MT_DEBUG_MODE"))))
 	(setenv "MT_DEBUG_MODE" (if (list? (verbosity))
 				    (string-intersperse (map conc (verbosity)) ",")
 				    (conc (verbosity)))))))
 
-(define (debug-print n e . params)
-  (if (debug-debug-mode n)
+(define (debug:print n e . params)
+  (if (debug:debug-mode n)
       (with-output-to-port (or e (current-error-port))
 	(lambda ()
 	  ;; (if *logging*
 	      ;; (db:log-event (apply conc params))
 	  (apply print params)
 	  )))) ;; )
+
+(define (debug:print-error n e . params)
+  ;; normal print
+  (if (debug:debug-mode n)
+      (with-output-to-port (if (port? e) e (current-error-port))
+	(lambda ()
+	  (apply print "ERROR: " params)
+	  )))
+  ;; pass important messages to stderr
+  (if (and (eq? n 0)(not (eq? e (current-error-port)))) 
+      (with-output-to-port (current-error-port)
+	(lambda ()
+	  (apply print "ERROR: " params)
+	  ))))
+
+(define (debug:print-info n e . params)
+  (if (debug:debug-mode n)
+      (with-output-to-port (if (port? e) e (current-error-port))
+	(lambda ()
+	  (apply print "INFO: (" n ") " params) ;; res)
+	  ))))
+
 )

Index: dashboard-context-menu.scm
==================================================================
--- dashboard-context-menu.scm
+++ dashboard-context-menu.scm
@@ -39,10 +39,13 @@
 (declare (uses rmt))
 (declare (uses ezsteps))
 ;; (declare (uses sdb))
 ;; (declare (uses filedb))
 (declare (uses subrun))
+
+(declare (uses commonmod))
+(import commonmod)
 
 (include "common_records.scm")
 (include "db_records.scm")
 (include "run_records.scm")
 

Index: dashboard-guimonitor.scm
==================================================================
--- dashboard-guimonitor.scm
+++ dashboard-guimonitor.scm
@@ -34,10 +34,13 @@
 (declare (unit dashboard-guimonitor))
 (declare (uses common))
 (declare (uses keys))
 (declare (uses db))
 (declare (uses tasks))
+
+(declare (uses commonmod))
+(import commonmod)
 
 (include "common_records.scm")
 (include "db_records.scm")
 (include "run_records.scm")
 (include "task_records.scm")

Index: dashboard-tests.scm
==================================================================
--- dashboard-tests.scm
+++ dashboard-tests.scm
@@ -38,10 +38,13 @@
 (declare (uses rmt))
 (declare (uses ezsteps))
 ;; (declare (uses sdb))
 ;; (declare (uses filedb))
 (declare (uses subrun))
+
+(declare (uses commonmod))
+(import commonmod)
 
 (include "common_records.scm")
 (include "db_records.scm")
 (include "run_records.scm")
 

Index: dashboard.scm
==================================================================
--- dashboard.scm
+++ dashboard.scm
@@ -45,10 +45,13 @@
 (declare (uses dashboard-context-menu))
 (declare (uses vg))
 (declare (uses subrun))
 ;; (declare (uses dashboard-main))
 (declare (uses mt))
+
+(declare (uses commonmod))
+(import commonmod)
 
 (include "common_records.scm")
 (include "db_records.scm")
 (include "run_records.scm")
 (include "task_records.scm")

Index: db.scm
==================================================================
--- db.scm
+++ db.scm
@@ -33,10 +33,13 @@
 (declare (uses common))
 (declare (uses keys))
 (declare (uses ods))
 (declare (uses client))
 (declare (uses mt))
+
+(declare (uses commonmod))
+(import commonmod)
 
 (include "common_records.scm")
 (include "db_records.scm")
 (include "key_records.scm")
 (include "run_records.scm")

Index: diff-report.scm
==================================================================
--- diff-report.scm
+++ diff-report.scm
@@ -18,10 +18,13 @@
 
 (declare (unit diff-report))
 (declare (uses common))
 (declare (uses rmt))
          
+(declare (uses commonmod))
+(import commonmod)
+
 (include "common_records.scm")
 (use matchable)
 (use fmt)
 (use ducttape-lib)
 (define css "")

Index: ezsteps.scm
==================================================================
--- ezsteps.scm
+++ ezsteps.scm
@@ -27,10 +27,13 @@
 (declare (uses common))
 (declare (uses items))
 (declare (uses runconfig))
 ;; (declare (uses sdb))
 ;; (declare (uses filedb))
+
+(declare (uses commonmod))
+(import commonmod)
 
 (include "common_records.scm")
 (include "key_records.scm")
 (include "db_records.scm")
 (include "run_records.scm")

Index: fs-transport.scm
==================================================================
--- fs-transport.scm
+++ fs-transport.scm
@@ -29,10 +29,13 @@
 
 (declare (uses common))
 (declare (uses db))
 (declare (uses tests))
 (declare (uses tasks)) ;; tasks are where stuff is maintained about what is running.
+
+(declare (uses commonmod))
+(import commonmod)
 
 (include "common_records.scm")
 (include "db_records.scm")
 
 

Index: http-transport.scm
==================================================================
--- http-transport.scm
+++ http-transport.scm
@@ -35,10 +35,13 @@
 (declare (uses tasks)) ;; tasks are where stuff is maintained about what is running.
 (declare (uses server))
 ;; (declare (uses daemon))
 (declare (uses portlogger))
 (declare (uses rmt))
+
+(declare (uses commonmod))
+(import commonmod)
 
 (include "common_records.scm")
 (include "db_records.scm")
 (include "js-path.scm")
 

Index: index-tree.scm
==================================================================
--- index-tree.scm
+++ index-tree.scm
@@ -29,10 +29,13 @@
 (declare (uses lock-queue))
 (declare (uses db))
 (declare (uses common))
 (declare (uses items))
 (declare (uses runconfig))
+
+(declare (uses commonmod))
+(import commonmod)
 
 (include "common_records.scm")
 (include "key_records.scm")
 (include "db_records.scm")
 (include "run_records.scm")

Index: items.scm
==================================================================
--- items.scm
+++ items.scm
@@ -21,10 +21,13 @@
 ;; 		     (temperature "cool medium hot")
 ;; 		     (season      "summer winter fall spring")))
 
 (declare (unit items))
 (declare (uses common))
+
+(declare (uses commonmod))
+(import commonmod)
 
 (include "common_records.scm")
 
 ;; Puts out all combinations
 (define (process-itemlist hierdepth curritemkey itemlist)

Index: keys.scm
==================================================================
--- keys.scm
+++ keys.scm
@@ -24,10 +24,13 @@
 (use sqlite3 srfi-1 posix regex regex-case srfi-69)
 (import (prefix sqlite3 sqlite3:))
 
 (declare (unit keys))
 (declare (uses common))
+
+(declare (uses commonmod))
+(import commonmod)
 
 (include "key_records.scm")
 (include "common_records.scm")
 
 (define (keys->keystr keys) ;; => key1,key2,key3,additiona1, ...

Index: launch.scm
==================================================================
--- launch.scm
+++ launch.scm
@@ -32,10 +32,13 @@
 (declare (uses subrun))
 (declare (uses common))
 (declare (uses configf))
 (declare (uses db))
 (declare (uses ezsteps))
+
+(declare (uses commonmod))
+(import commonmod)
 
 (include "common_records.scm")
 (include "key_records.scm")
 (include "db_records.scm")
 (include "megatest-fossil-hash.scm")

Index: lock-queue.scm
==================================================================
--- lock-queue.scm
+++ lock-queue.scm
@@ -20,10 +20,12 @@
 
 (declare (unit lock-queue))
 (declare (uses common))
 (declare (uses tasks))
 
+(declare (uses commonmod))
+(import commonmod)
 ;;======================================================================
 ;; attempt to prevent overlapping updates of rollup files by queueing
 ;; update requests in an sqlite db
 ;;======================================================================
 

Index: megatest.scm
==================================================================
--- megatest.scm
+++ megatest.scm
@@ -465,11 +465,11 @@
 			"-convert-to-norm"
 			"-convert-to-old"
 			"-import-megatest.db"
 			"-sync-to-megatest.db"
                         "-sync-brute-force"
-			"-logging"
+			;; "-logging"
 			"-v" ;; verbose 2, more than normal (normal is 1)
 			"-q" ;; quiet 0, errors/warnings only
 
                         "-diff-rep"
 
@@ -657,13 +657,16 @@
 
 ;;======================================================================
 ;; Misc setup stuff
 ;;======================================================================
 
-(debug:setup)
+(debug:setup (cond
+	      ((args:get-arg "-debug-noprop") 'noprop)
+	      ((args:get-arg "-debug")         #t)
+	      (else #f)))
 
-(if (args:get-arg "-logging")(set! *logging* #t))
+;; (if (args:get-arg "-logging")(set! *logging* #t))
 
 ;;(if (debug:debug-mode 3) ;; we are obviously debugging
 ;;    (set! open-run-close open-run-close-no-exception-handling))
 
 (if (args:get-arg "-itempatt")

Index: mt.scm
==================================================================
--- mt.scm
+++ mt.scm
@@ -28,10 +28,13 @@
 (declare (uses tests))
 (declare (uses server))
 (declare (uses runs))
 (declare (uses rmt))
 ;; (declare (uses filedb))
+
+(declare (uses commonmod))
+(import commonmod)
 
 (include "common_records.scm")
 (include "key_records.scm")
 (include "db_records.scm")
 (include "run_records.scm")

Index: mtut.scm
==================================================================
--- mtut.scm
+++ mtut.scm
@@ -30,10 +30,13 @@
 
 (declare (uses common))
 (declare (uses margs))
 (declare (uses configf))
 ;; (declare (uses rmt))
+
+(declare (uses commonmod))
+(import commonmod)
 
 (use ducttape-lib)
 
 (include "megatest-fossil-hash.scm")
 

Index: newdashboard.scm
==================================================================
--- newdashboard.scm
+++ newdashboard.scm
@@ -29,10 +29,13 @@
      (prefix dbi dbi:))
 
 (declare (uses common))
 (declare (uses megatest-version))
 (declare (uses margs))
+
+(declare (uses commonmod))
+(import commonmod)
 
 ;; (declare (uses launch))
 ;; (declare (uses gutils))
 ;; (declare (uses db))
 ;; (declare (uses server))

Index: ods.scm
==================================================================
--- ods.scm
+++ ods.scm
@@ -17,10 +17,12 @@
 ;;
 
 (use csv-xml regex)
 (declare (unit ods))
 (declare (uses common))
+(declare (uses commonmod))
+(import commonmod)
 
 (define ods:dirs
   '("Configurations2"
     "Configurations2/toolpanel"
     "Configurations2/menubar"

Index: runconfig.scm
==================================================================
--- runconfig.scm
+++ runconfig.scm
@@ -22,10 +22,13 @@
 
 (use format directory-utils)
 
 (declare (unit runconfig))
 (declare (uses common))
+
+(declare (uses commonmod))
+(import commonmod)
 
 (include "common_records.scm")
 
 (define (runconfig:read fname target environ-patt)
   (let ((ht (make-hash-table)))

Index: runs.scm
==================================================================
--- runs.scm
+++ runs.scm
@@ -29,10 +29,13 @@
 (declare (uses tests))
 (declare (uses server))
 (declare (uses mt))
 (declare (uses archive))
 ;; (declare (uses filedb))
+
+(declare (uses commonmod))
+(import commonmod)
 
 (include "common_records.scm")
 (include "key_records.scm")
 (include "db_records.scm")
 (include "run_records.scm")

Index: server.scm
==================================================================
--- server.scm
+++ server.scm
@@ -31,10 +31,13 @@
 ;; (declare (uses synchash))
 (declare (uses http-transport))
 ;;(declare (uses rpc-transport))
 (declare (uses launch))
 ;; (declare (uses daemon))
+
+(declare (uses commonmod))
+(import commonmod)
 
 (include "common_records.scm")
 (include "db_records.scm")
 
 (define (server:make-server-url hostport)

Index: subrun.scm
==================================================================
--- subrun.scm
+++ subrun.scm
@@ -31,11 +31,14 @@
 ;;(declare (uses server))
 (declare (uses mt))
 ;;(declare (uses archive))
 ;; (declare (uses filedb))
 
-;(include "common_records.scm")
+(declare (uses commonmod))
+(import commonmod)
+
+;;(include "common_records.scm")
 ;;(include "key_records.scm")
 (include "db_records.scm") ;; provides db:test-get-id
 ;;(include "run_records.scm")
 ;;(include "test_records.scm")
 

Index: tasks.scm
==================================================================
--- tasks.scm
+++ tasks.scm
@@ -26,10 +26,13 @@
 (declare (uses rmt))
 (declare (uses common))
 (declare (uses pgdb))
 
 ;; (import pgdb) ;; pgdb is a module
+
+(declare (uses commonmod))
+(import commonmod)
 
 (include "task_records.scm")
 (include "db_records.scm")
 
 ;;======================================================================

Index: tcmt.scm
==================================================================
--- tcmt.scm
+++ tcmt.scm
@@ -30,10 +30,13 @@
 
 (declare (uses margs))
 (declare (uses rmt))
 (declare (uses common))
 ;; (declare (uses megatest-version))
+
+(declare (uses commonmod))
+(import commonmod)
 
 (include "megatest-version.scm")
 (include "megatest-fossil-hash.scm")
 (include "db_records.scm")
 

Index: tdb.scm
==================================================================
--- tdb.scm
+++ tdb.scm
@@ -32,10 +32,13 @@
 (declare (uses keys))
 (declare (uses ods))
 (declare (uses client))
 (declare (uses mt))
 (declare (uses db))
+
+(declare (uses commonmod))
+(import commonmod)
 
 (include "common_records.scm")
 (include "db_records.scm")
 (include "key_records.scm")
 (include "run_records.scm")

Index: tests.scm
==================================================================
--- tests.scm
+++ tests.scm
@@ -35,10 +35,13 @@
 ;;(declare (uses stml2))
 
 (use sqlite3 srfi-1 posix regex regex-case srfi-69 dot-locking tcp directory-utils)
 (import (prefix sqlite3 sqlite3:))
 (require-library stml)
+
+(declare (uses commonmod))
+(import commonmod)
 
 (include "common_records.scm")
 (include "key_records.scm")
 (include "db_records.scm")
 (include "run_records.scm")

Index: tree.scm
==================================================================
--- tree.scm
+++ tree.scm
@@ -33,10 +33,14 @@
 (declare (uses gutils))
 (declare (uses db))
 (declare (uses server))
 ;; (declare (uses synchash))
 (declare (uses dcommon))
+
+(declare (uses commonmod))
+(import commonmod)
+
 
 (include "megatest-version.scm")
 (include "common_records.scm")
 (include "db_records.scm")
 (include "key_records.scm")