Index: common.scm
==================================================================
--- common.scm
+++ common.scm
@@ -22,12 +22,11 @@
      format dot-locking csv-xml z3 ;; sql-de-lite
      hostinfo md5 message-digest typed-records directory-utils stack
      matchable regex posix (srfi 18) extras ;; tcp 
      (prefix nanomsg nmsg:)
      (prefix sqlite3 sqlite3:)
-     pkts (prefix dbi dbi:)
-     )
+     pkts (prefix dbi dbi:)(prefix margs args:))
 
 (declare (unit common))
 
 (include "common_records.scm")
 

Index: configf.scm
==================================================================
--- configf.scm
+++ configf.scm
@@ -20,11 +20,11 @@
 
 ;;======================================================================
 ;; Config file handling
 ;;======================================================================
 
-(use regex regex-case) ;;  directory-utils)
+(use regex regex-case (prefix margs args:)) ;;  directory-utils)
 (declare (unit configf))
 (declare (uses process))
 (declare (uses env))
 (declare (uses keys))
 

Index: dashboard.scm
==================================================================
--- dashboard.scm
+++ dashboard.scm
@@ -24,15 +24,15 @@
 (import (prefix iup iup:))
 
 (use canvas-draw)
 (import canvas-draw-iup)
 (use ducttape-lib)
-(use sqlite3 srfi-1 posix regex regex-case srfi-69 typed-records sparse-vectors) ;; defstruct
+(use sqlite3 srfi-1 posix regex regex-case srfi-69 typed-records sparse-vectors (prefix margs args:)) ;; defstruct
 (import (prefix sqlite3 sqlite3:))
 
 (declare (uses common))
-(declare (uses margs))
+;; (declare (uses margs))
 (declare (uses keys))
 (declare (uses items))
 (declare (uses db))
 (declare (uses configf))
 (declare (uses process))

Index: datashare.scm
==================================================================
--- datashare.scm
+++ datashare.scm
@@ -25,10 +25,11 @@
 (use posix)
 (use json)
 (use csv)
 (use srfi-18)
 (use format)
+(use (prefix margs args:))
 
 (require-library iup)
 (import (prefix iup iup:))
 (require-library ini-file)
 (import (prefix ini-file ini:))
@@ -39,11 +40,11 @@
 (use sqlite3 srfi-1 posix regex regex-case srfi-69)
 (import (prefix sqlite3 sqlite3:))
 
 (declare (uses configf))
 (declare (uses tree))
-(declare (uses margs))
+;; (declare (uses margs))
 ;; (declare (uses dcommon))
 ;; (declare (uses launch))
 ;; (declare (uses gutils))
 ;; (declare (uses db))
 ;; (declare (uses synchash))

Index: db.scm
==================================================================
--- db.scm
+++ db.scm
@@ -22,11 +22,11 @@
 ;; Database access
 ;;======================================================================
 
 ;; dbstruct vector containing all the relevant dbs like main.db, megatest.db, run.db etc
 
-(use (srfi 18) extras tcp stack)
+(use (srfi 18) extras tcp stack (prefix margs args:))
 (use sqlite3 srfi-1 posix regex regex-case srfi-69 csv-xml s11n md5 message-digest base64 format dot-locking z3 typed-records matchable)
 (import (prefix sqlite3 sqlite3:))
 (import (prefix base64 base64:))
 
 (declare (unit db))

Index: env.scm
==================================================================
--- env.scm
+++ env.scm
@@ -18,11 +18,11 @@
 
 ;;======================================================================
 
 (declare (unit env))
 
-(use sql-de-lite) ;; srfi-1 posix regex regex-case srfi-69 srfi-18 call-with-environment-variables)
+(use sql-de-lite (prefix margs args:)) ;; srfi-1 posix regex regex-case srfi-69 srfi-18 call-with-environment-variables)
 
 (define (env:open-db fname)
   (let* ((db-exists (common:file-exists? fname))
 	 (db        (open-database fname)))
     (if (not db-exists)

Index: ezsteps.scm
==================================================================
--- ezsteps.scm
+++ ezsteps.scm
@@ -17,11 +17,11 @@
 ;;     along with Megatest.  If not, see <http://www.gnu.org/licenses/>.
 ;;
 
 ;;  strftime('%m/%d/%Y %H:%M:%S','now','localtime')
 
-(use srfi-1 posix regex srfi-69 directory-utils)
+(use srfi-1 posix regex srfi-69 directory-utils (prefix margs args:))
 
 (declare (unit ezsteps))
 (declare (uses db))
 (declare (uses common))
 (declare (uses items))

Index: http-transport.scm
==================================================================
--- http-transport.scm
+++ http-transport.scm
@@ -19,11 +19,11 @@
 (require-extension (srfi 18) extras tcp s11n)
 
 
 (use  srfi-1 posix regex regex-case srfi-69 hostinfo md5 message-digest posix-extras)
 
-(use spiffy uri-common intarweb http-client spiffy-request-vars intarweb spiffy-directory-listing)
+(use spiffy uri-common intarweb http-client spiffy-request-vars intarweb spiffy-directory-listing (prefix margs args:))
 
 ;; Configurations for server
 (tcp-buffer-size 2048)
 (max-connections 2048) 
 

Index: keys.scm
==================================================================
--- keys.scm
+++ keys.scm
@@ -20,11 +20,11 @@
 ;;======================================================================
 ;; Run keys, these are used to hierarchially organise tests and run areas
 ;;======================================================================
 
 (use sqlite3 srfi-1 posix regex regex-case srfi-69)
-(import (prefix sqlite3 sqlite3:))
+(import (prefix sqlite3 sqlite3:) (prefix margs args:))
 
 (declare (unit keys))
 (declare (uses common))
 
 (include "key_records.scm")

Index: launch.scm
==================================================================
--- launch.scm
+++ launch.scm
@@ -20,11 +20,11 @@
 ;; launch a task - this runs on the originating host, tests themselves
 ;;
 ;;======================================================================
 
 (use regex regex-case base64 sqlite3 srfi-18 directory-utils posix-extras z3 call-with-environment-variables csv)
-(use typed-records pathname-expand matchable)
+(use typed-records pathname-expand matchable (prefix margs args:))
 
 (import (prefix base64 base64:))
 (import (prefix sqlite3 sqlite3:))
 
 (declare (unit launch))

Index: megatest.scm
==================================================================
--- megatest.scm
+++ megatest.scm
@@ -22,11 +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 (prefix margs args:))
 
 ;; Added for csv stuff - will be removed
 ;;
 (use sparse-vectors)
 
@@ -34,11 +34,11 @@
 
 ;; (use zmq)
 
 (declare (uses common))
 (declare (uses megatest-version))
-(declare (uses margs))
+;; (declare (uses margs))
 (declare (uses runs))
 (declare (uses launch))
 (declare (uses server))
 (declare (uses client))
 (declare (uses tests))

Index: mtut.scm
==================================================================
--- mtut.scm
+++ mtut.scm
@@ -23,15 +23,16 @@
 (define (toplevel-command . a) #f)
 
 (use srfi-1 posix srfi-69 readline ;;  regex regex-case srfi-69 apropos json http-client directory-utils rpc typed-records;; (srfi 18) extras)
      srfi-18 extras format pkts regex regex-case
      (prefix dbi dbi:)
-     nanomsg)
+     nanomsg
+     (prefix margs args:))
 
 (declare (uses common))
 (declare (uses megatest-version))
-(declare (uses margs))
+;; (declare (uses margs))
 (declare (uses configf))
 ;; (declare (uses rmt))
 
 (include "megatest-fossil-hash.scm")
 

Index: newdashboard.scm
==================================================================
--- newdashboard.scm
+++ newdashboard.scm
@@ -24,15 +24,15 @@
 
 (use canvas-draw)
 (import canvas-draw-iup)
 
 (use sql-de-lite srfi-1 posix regex regex-case srfi-69 typed-records sparse-vectors ;; defstruct
-     (prefix dbi dbi:))
+     (prefix dbi dbi:) (prefix margs args:))
 
 (declare (uses common))
 (declare (uses megatest-version))
-(declare (uses margs))
+;; (declare (uses margs))
 
 ;; (declare (uses launch))
 ;; (declare (uses gutils))
 ;; (declare (uses db))
 ;; (declare (uses server))

Index: rpc-transport.scm
==================================================================
--- rpc-transport.scm
+++ rpc-transport.scm
@@ -18,11 +18,11 @@
 ;;
 
 (require-extension (srfi 18) extras tcp s11n rpc)
 (import (prefix rpc rpc:))
 
-(use sqlite3 srfi-1 posix regex regex-case srfi-69 hostinfo md5 message-digest)
+(use sqlite3 srfi-1 posix regex regex-case srfi-69 hostinfo md5 message-digest (prefix margs args:))
 (import (prefix sqlite3 sqlite3:))
 
 (declare (unit rpc-transport))
 
 (declare (uses common))

Index: runs.scm
==================================================================
--- runs.scm
+++ runs.scm
@@ -17,11 +17,11 @@
 ;;     along with Megatest.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;  strftime('%m/%d/%Y %H:%M:%S','now','localtime')
 
 (use (prefix sqlite3 sqlite3:) srfi-1 posix regex regex-case srfi-69 (srfi 18) 
-     posix-extras directory-utils pathname-expand typed-records format)
+     posix-extras directory-utils pathname-expand typed-records format (prefix margs args:))
 
 (declare (unit runs))
 (declare (uses db))
 (declare (uses common))
 (declare (uses items))

Index: sauthorize.scm
==================================================================
--- sauthorize.scm
+++ sauthorize.scm
@@ -22,15 +22,15 @@
 
 (use srfi-18)
 (use srfi-19)
 (use refdb)
 
-(use sql-de-lite srfi-1 posix regex regex-case srfi-69)
+(use sql-de-lite srfi-1 posix regex regex-case srfi-69 (prefix margs args:))
 (declare (uses common))
 
 (declare (uses configf))
-(declare (uses margs))
+;; (declare (uses margs))
 (declare (uses megatest-version))
 
 (include "megatest-fossil-hash.scm")
 ;;; please create this file before using sautherise. For sample file is avaliable sample-sauth-paths.scm. 
 (include "sauth-paths.scm")

Index: server.scm
==================================================================
--- server.scm
+++ server.scm
@@ -18,11 +18,11 @@
 ;;
 
 (require-extension (srfi 18) extras tcp s11n)
 
 (use srfi-1 posix regex regex-case srfi-69 hostinfo md5 message-digest
-     directory-utils posix-extras matchable)
+     directory-utils posix-extras matchable (prefix margs args:))
 
 (use spiffy uri-common intarweb http-client spiffy-request-vars)
 
 (declare (unit server))
 

Index: sharedat.scm
==================================================================
--- sharedat.scm
+++ sharedat.scm
@@ -32,16 +32,16 @@
 (use format)
 
 (require-library ini-file)
 (import (prefix ini-file ini:))
 
-(use sql-de-lite srfi-1 posix regex regex-case srfi-69)
+(use sql-de-lite srfi-1 posix regex regex-case srfi-69 (prefix margs args:))
 ;; (import (prefix sqlite3 sqlite3:))
 ;; 
 (declare (uses configf))
 ;; (declare (uses tree))
-(declare (uses margs))
+;; (declare (uses margs))
 ;; (declare (uses dcommon))
 ;; (declare (uses launch))
 ;; (declare (uses gutils))
 ;; (declare (uses db))
 ;; (declare (uses synchash))

Index: spublish.scm
==================================================================
--- spublish.scm
+++ spublish.scm
@@ -20,15 +20,15 @@
 (use scsh-process)
 (use refdb)
 (use srfi-18)
 (use srfi-19)
 (use format)
-(use sql-de-lite srfi-1 posix regex regex-case srfi-69)
+(use sql-de-lite srfi-1 posix regex regex-case srfi-69 (prefix margs args:))
 
 (declare (uses configf))
 ;; (declare (uses tree))
-(declare (uses margs))
+;; (declare (uses margs))
 
 (declare (uses megatest-version))
 ;; (declare (uses tbd))
 
 (include "megatest-fossil-hash.scm")

Index: sretrieve.scm
==================================================================
--- sretrieve.scm
+++ sretrieve.scm
@@ -20,14 +20,14 @@
 (use defstruct)
 (use scsh-process)
 (use srfi-18)
 (use srfi-19)
 (use refdb)
-(use sql-de-lite srfi-1 posix regex regex-case srfi-69)
+(use sql-de-lite srfi-1 posix regex regex-case srfi-69 (prefix margs args:))
 ;(declare (uses common))
 ;(declare (uses configf))
-(declare (uses margs))
+;; (declare (uses margs))
 (declare (uses megatest-version))
  
 
 (include "megatest-fossil-hash.scm")
 ;;; please create this file before using sautherise. For sample file is avaliable sample-sauth-paths.scm. 

Index: tasks.scm
==================================================================
--- tasks.scm
+++ tasks.scm
@@ -16,11 +16,11 @@
 ;;     along with Megatest.  If not, see <http://www.gnu.org/licenses/>.
 ;;
 
 ;;  strftime('%m/%d/%Y %H:%M:%S','now','localtime')
 
-(use sqlite3 srfi-1 posix regex regex-case srfi-69 dot-locking format)
+(use sqlite3 srfi-1 posix regex regex-case srfi-69 dot-locking format (prefix margs args:))
 (import (prefix sqlite3 sqlite3:))
 
 (declare (unit tasks))
 (declare (uses db))
 (declare (uses rmt))

Index: tcmt.scm
==================================================================
--- tcmt.scm
+++ tcmt.scm
@@ -21,16 +21,16 @@
 ;;
 ;;  1. Run the megatest process and pass it all the needed parameters
 ;;  2. Every five seconds check for state/status changes and print the info
 ;;
 
-(use srfi-1 posix srfi-69 srfi-18 regex defstruct)
+(use srfi-1 posix srfi-69 srfi-18 regex defstruct (prefix margs args:))
 
 (use trace)
 ;; (trace-call-sites #t)
 
-(declare (uses margs))
+;; (declare (uses margs))
 (declare (uses rmt))
 (declare (uses common))
 (declare (uses megatest-version))
 
 (include "megatest-fossil-hash.scm")

Index: tdb.scm
==================================================================
--- tdb.scm
+++ tdb.scm
@@ -21,11 +21,11 @@
 ;;======================================================================
 ;; Database access
 ;;======================================================================
 
 (require-extension (srfi 18) extras tcp)
-(use sqlite3 srfi-1 posix regex regex-case srfi-69 csv-xml s11n md5 message-digest base64)
+(use sqlite3 srfi-1 posix regex regex-case srfi-69 csv-xml s11n md5 message-digest base64 (prefix margs args:))
 (import (prefix sqlite3 sqlite3:))
 (import (prefix base64 base64:))
 
 (declare (unit tdb))
 (declare (uses common))

Index: tests.scm
==================================================================
--- tests.scm
+++ tests.scm
@@ -20,11 +20,11 @@
 
 ;;======================================================================
 ;; Tests
 ;;======================================================================
 
-(use sqlite3 srfi-1 posix regex regex-case srfi-69 dot-locking tcp directory-utils)
+(use sqlite3 srfi-1 posix regex regex-case srfi-69 dot-locking tcp directory-utils (prefix margs args:))
 (import (prefix sqlite3 sqlite3:))
 (require-library stml)
 
 (declare (unit tests))
 (declare (uses lock-queue))