@@ -15,12 +15,16 @@
 (require-extension (srfi 18) extras tcp rpc)
 
 (import (prefix sqlite3 sqlite3:))
 (import (prefix base64 base64:))
 
+(declare (unit common))
+
+(include "common_records.scm")
+
 ;; (require-library margs)
-(include "margs.scm")
+;; (include "margs.scm")
 
 (define getenv get-environment-variable)
 
 (define home (getenv "HOME"))
 (define user (getenv "USER"))
@@ -34,31 +38,22 @@
 (define *globalexitstatus* 0) ;; attempt to work around possible thread issues
 (define *passnum*     0) ;; when running track calls to run-tests or similar
 (define *verbosity*   1)
 (define *rpc:listener* #f) ;; if set up for server communication this will hold the tcp port
 
-(define-inline (get-with-default val default)
+(define (get-with-default val default)
   (let ((val (args:get-arg val)))
     (if val val default)))
 
-(define-inline (assoc/default key lst . default)
+(define (assoc/default key lst . default)
   (let ((res (assoc key lst)))
     (if res (cadr res)(if (null? default) #f (car default)))))
 
 ;;======================================================================
 ;; Misc utils
 ;;======================================================================
 
-(define-inline (debug:print n . params)
-  (if (<= n *verbosity*)
-      (apply print params)))
-
-;; 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 ""))
-
 ;; convert stuff to a number if possible
 (define (any->number val)
   (cond 
    ((number? val) val)
    ((string? val) (string->number val))