diff --git a/makefile.darwin.clang.x86_64 b/makefile.darwin.clang.x86_64
index fef4068d..8b6df0f2 100644
--- a/makefile.darwin.clang.x86_64
+++ b/makefile.darwin.clang.x86_64
@@ -221,7 +221,7 @@ stage6:
 	$(VOCSTATIC) -sP ulmConclusions.Mod
 	$(VOCSTATIC) -sP ulmRandomGenerators.Mod
 	$(VOCSTATIC) -sP ulmTCrypt.Mod
-        $(VOCSTATIC) -sP ulmIntOperations.Mod
+	$(VOCSTATIC) -sP ulmIntOperations.Mod
 
 	#pow32 libs
 	$(VOCSTATIC) -sP powStrings.Mod
@@ -246,7 +246,7 @@ stage6:
 	$(VOCSTATIC) -sP ethRandomNumbers.Mod
 	$(VOCSTATIC) -sP ethGZReaders.Mod
 	$(VOCSTATIC) -sP ethGZWriters.Mod
-        $(VOCSTATIC) -sP ethUnicode.Mod
+	$(VOCSTATIC) -sP ethUnicode.Mod
 
 # build remaining tools
 #	$(VOCSTATIC0) -sPS compatIn.Mod
diff --git a/makefile.freebsd.clang.x86_64 b/makefile.freebsd.clang.x86_64
index 852bf706..d3f9af19 100644
--- a/makefile.freebsd.clang.x86_64
+++ b/makefile.freebsd.clang.x86_64
@@ -220,7 +220,7 @@ stage6:
 	$(VOCSTATIC) -sP ulmConclusions.Mod
 	$(VOCSTATIC) -sP ulmRandomGenerators.Mod
 	$(VOCSTATIC) -sP ulmTCrypt.Mod
-        $(VOCSTATIC) -sP ulmIntOperations.Mod
+	$(VOCSTATIC) -sP ulmIntOperations.Mod
 
 	#pow32 libs
 	$(VOCSTATIC) -sP powStrings.Mod
@@ -245,7 +245,7 @@ stage6:
 	$(VOCSTATIC) -sP ethRandomNumbers.Mod
 	$(VOCSTATIC) -sP ethGZReaders.Mod
 	$(VOCSTATIC) -sP ethGZWriters.Mod
-        $(VOCSTATIC) -sP ethUnicode.Mod
+	$(VOCSTATIC) -sP ethUnicode.Mod
 
 # build remaining tools
 #	$(VOCSTATIC0) -sPS compatIn.Mod
diff --git a/makefile.linux.clang.powerpc b/makefile.linux.clang.powerpc
index 8f4a78b2..a0bf3422 100644
--- a/makefile.linux.clang.powerpc
+++ b/makefile.linux.clang.powerpc
@@ -220,7 +220,7 @@ stage6:
 	$(VOCSTATIC) -sP ulmConclusions.Mod
 	$(VOCSTATIC) -sP ulmRandomGenerators.Mod
 	$(VOCSTATIC) -sP ulmTCrypt.Mod
-        $(VOCSTATIC) -sP ulmIntOperations.Mod
+	$(VOCSTATIC) -sP ulmIntOperations.Mod
 
 	#pow32 libs
 	$(VOCSTATIC) -sP powStrings.Mod
@@ -245,7 +245,7 @@ stage6:
 	$(VOCSTATIC) -sP ethRandomNumbers.Mod
 	$(VOCSTATIC) -sP ethGZReaders.Mod
 	$(VOCSTATIC) -sP ethGZWriters.Mod
-        $(VOCSTATIC) -sP ethUnicode.Mod
+	$(VOCSTATIC) -sP ethUnicode.Mod
 
 # build remaining tools
 #	$(VOCSTATIC0) -sPS compatIn.Mod
diff --git a/makefile.linux.clang.x86_64 b/makefile.linux.clang.x86_64
index 8dbe2714..fe14919c 100644
--- a/makefile.linux.clang.x86_64
+++ b/makefile.linux.clang.x86_64
@@ -220,7 +220,7 @@ stage6:
 	$(VOCSTATIC) -sP ulmConclusions.Mod
 	$(VOCSTATIC) -sP ulmRandomGenerators.Mod
 	$(VOCSTATIC) -sP ulmTCrypt.Mod
-        $(VOCSTATIC) -sP ulmIntOperations.Mod	
+	$(VOCSTATIC) -sP ulmIntOperations.Mod	
 
 	#pow32 libs
 	$(VOCSTATIC) -sP powStrings.Mod
@@ -245,7 +245,7 @@ stage6:
 	$(VOCSTATIC) -sP ethRandomNumbers.Mod
 	$(VOCSTATIC) -sP ethGZReaders.Mod
 	$(VOCSTATIC) -sP ethGZWriters.Mod
-        $(VOCSTATIC) -sP ethUnicode.Mod
+	$(VOCSTATIC) -sP ethUnicode.Mod
 
 # build remaining tools
 #	$(VOCSTATIC0) -sPS compatIn.Mod
diff --git a/makefile.linux.gcc.armv6j b/makefile.linux.gcc.armv6j
index d4d5e6ab..9c9d59a9 100644
--- a/makefile.linux.gcc.armv6j
+++ b/makefile.linux.gcc.armv6j
@@ -220,7 +220,7 @@ stage6:
 	$(VOCSTATIC) -sP ulmConclusions.Mod
 	$(VOCSTATIC) -sP ulmRandomGenerators.Mod
 	$(VOCSTATIC) -sP ulmTCrypt.Mod
-        $(VOCSTATIC) -sP ulmIntOperations.Mod
+	$(VOCSTATIC) -sP ulmIntOperations.Mod
 
 	#pow32 libs
 	$(VOCSTATIC) -sP powStrings.Mod
@@ -245,7 +245,7 @@ stage6:
 	$(VOCSTATIC) -sP ethRandomNumbers.Mod
 	$(VOCSTATIC) -sP ethGZReaders.Mod
 	$(VOCSTATIC) -sP ethGZWriters.Mod
-        $(VOCSTATIC) -sP ethUnicode.Mod
+	$(VOCSTATIC) -sP ethUnicode.Mod
 
 # build remaining tools
 #	$(VOCSTATIC0) -sPS compatIn.Mod
diff --git a/makefile.linux.gcc.armv6j_hardfp b/makefile.linux.gcc.armv6j_hardfp
index 6b178c1c..20304dd4 100644
--- a/makefile.linux.gcc.armv6j_hardfp
+++ b/makefile.linux.gcc.armv6j_hardfp
@@ -220,7 +220,7 @@ stage6:
 	$(VOCSTATIC) -sP ulmConclusions.Mod
 	$(VOCSTATIC) -sP ulmRandomGenerators.Mod
 	$(VOCSTATIC) -sP ulmTCrypt.Mod
-        $(VOCSTATIC) -sP ulmIntOperations.Mod
+	$(VOCSTATIC) -sP ulmIntOperations.Mod
 
 	#pow32 libs
 	$(VOCSTATIC) -sP powStrings.Mod
@@ -245,7 +245,7 @@ stage6:
 	$(VOCSTATIC) -sP ethRandomNumbers.Mod
 	$(VOCSTATIC) -sP ethGZReaders.Mod
 	$(VOCSTATIC) -sP ethGZWriters.Mod
-        $(VOCSTATIC) -sP ethUnicode.Mod
+	$(VOCSTATIC) -sP ethUnicode.Mod
 
 # build remaining tools
 #	$(VOCSTATIC0) -sPS compatIn.Mod
diff --git a/makefile.linux.gcc.armv7a_hardfp b/makefile.linux.gcc.armv7a_hardfp
index 316d17c5..bb6ddc71 100644
--- a/makefile.linux.gcc.armv7a_hardfp
+++ b/makefile.linux.gcc.armv7a_hardfp
@@ -220,7 +220,7 @@ stage6:
 	$(VOCSTATIC) -sP ulmConclusions.Mod
 	$(VOCSTATIC) -sP ulmRandomGenerators.Mod
 	$(VOCSTATIC) -sP ulmTCrypt.Mod
-        $(VOCSTATIC) -sP ulmIntOperations.Mod	
+	$(VOCSTATIC) -sP ulmIntOperations.Mod	
 
 	#pow32 libs
 	$(VOCSTATIC) -sP powStrings.Mod
@@ -245,7 +245,7 @@ stage6:
 	$(VOCSTATIC) -sP ethRandomNumbers.Mod
 	$(VOCSTATIC) -sP ethGZReaders.Mod
 	$(VOCSTATIC) -sP ethGZWriters.Mod
-        $(VOCSTATIC) -sP ethUnicode.Mod
+	$(VOCSTATIC) -sP ethUnicode.Mod
 
 # build remaining tools
 #	$(VOCSTATIC0) -sPS compatIn.Mod
diff --git a/makefile.linux.gcc.powerpc b/makefile.linux.gcc.powerpc
index 2516e380..df52092f 100644
--- a/makefile.linux.gcc.powerpc
+++ b/makefile.linux.gcc.powerpc
@@ -220,7 +220,7 @@ stage6:
 	$(VOCSTATIC) -sP ulmConclusions.Mod
 	$(VOCSTATIC) -sP ulmRandomGenerators.Mod
 	$(VOCSTATIC) -sP ulmTCrypt.Mod
-        $(VOCSTATIC) -sP ulmIntOperations.Mod	
+	$(VOCSTATIC) -sP ulmIntOperations.Mod	
 
 	#pow32 libs
 	$(VOCSTATIC) -sP powStrings.Mod
@@ -245,7 +245,7 @@ stage6:
 	$(VOCSTATIC) -sP ethRandomNumbers.Mod
 	$(VOCSTATIC) -sP ethGZReaders.Mod
 	$(VOCSTATIC) -sP ethGZWriters.Mod
-        $(VOCSTATIC) -sP ethUnicode.Mod
+	$(VOCSTATIC) -sP ethUnicode.Mod
 
 # build remaining tools
 #	$(VOCSTATIC0) -sPS compatIn.Mod
diff --git a/makefile.linux.gcc.x86 b/makefile.linux.gcc.x86
index 23bd6356..2bd09224 100644
--- a/makefile.linux.gcc.x86
+++ b/makefile.linux.gcc.x86
@@ -220,7 +220,7 @@ stage6:
 	$(VOCSTATIC) -sP ulmConclusions.Mod
 	$(VOCSTATIC) -sP ulmRandomGenerators.Mod
 	$(VOCSTATIC) -sP ulmTCrypt.Mod
-        $(VOCSTATIC) -sP ulmIntOperations.Mod	
+	$(VOCSTATIC) -sP ulmIntOperations.Mod	
 
 	#pow32 libs
 	$(VOCSTATIC) -sP powStrings.Mod
@@ -245,7 +245,7 @@ stage6:
 	$(VOCSTATIC) -sP ethRandomNumbers.Mod
 	$(VOCSTATIC) -sP ethGZReaders.Mod
 	$(VOCSTATIC) -sP ethGZWriters.Mod
-        $(VOCSTATIC) -sP ethUnicode.Mod
+	$(VOCSTATIC) -sP ethUnicode.Mod
 
 # build remaining tools
 #	$(VOCSTATIC0) -sPS compatIn.Mod
diff --git a/makefile.linux.gcc.x86_64 b/makefile.linux.gcc.x86_64
index 068dc11a..9a1b29de 100644
--- a/makefile.linux.gcc.x86_64
+++ b/makefile.linux.gcc.x86_64
@@ -220,7 +220,7 @@ stage6:
 	$(VOCSTATIC) -sP ulmConclusions.Mod
 	$(VOCSTATIC) -sP ulmRandomGenerators.Mod
 	$(VOCSTATIC) -sP ulmTCrypt.Mod
-        $(VOCSTATIC) -sP ulmIntOperations.Mod	
+	$(VOCSTATIC) -sP ulmIntOperations.Mod	
 
 	#pow32 libs
 	$(VOCSTATIC) -sP powStrings.Mod
@@ -245,7 +245,7 @@ stage6:
 	$(VOCSTATIC) -sP ethRandomNumbers.Mod
 	$(VOCSTATIC) -sP ethGZReaders.Mod
 	$(VOCSTATIC) -sP ethGZWriters.Mod
-        $(VOCSTATIC) -sP ethUnicode.Mod
+	$(VOCSTATIC) -sP ethUnicode.Mod
 
 # build remaining tools
 #	$(VOCSTATIC0) -sPS compatIn.Mod
diff --git a/src/lib/system/darwin/clang/x86_64/Args.Mod b/src/lib/system/darwin/clang/Args.Mod
similarity index 100%
rename from src/lib/system/darwin/clang/x86_64/Args.Mod
rename to src/lib/system/darwin/clang/Args.Mod
diff --git a/src/lib/system/freebsd/clang/x86_64/Args.Mod b/src/lib/system/freebsd/clang/Args.Mod
similarity index 100%
rename from src/lib/system/freebsd/clang/x86_64/Args.Mod
rename to src/lib/system/freebsd/clang/Args.Mod
diff --git a/src/lib/system/linux/clang/x86_64/Args.Mod b/src/lib/system/linux/clang/Args.Mod
similarity index 100%
rename from src/lib/system/linux/clang/x86_64/Args.Mod
rename to src/lib/system/linux/clang/Args.Mod
diff --git a/src/lib/system/linux/clang/armv6j/Args.Mod b/src/lib/system/linux/clang/armv6j/Args.Mod
deleted file mode 100644
index e8cd2a3c..00000000
--- a/src/lib/system/linux/clang/armv6j/Args.Mod
+++ /dev/null
@@ -1,64 +0,0 @@
-MODULE Args;  (* jt, 8.12.94 *)
-
-  (* command line argument handling for ofront *)
-
-
-  IMPORT SYSTEM;
-  
-  TYPE
-    ArgPtr = POINTER TO ARRAY 1024 OF CHAR;
-    ArgVec = POINTER TO ARRAY 1024 OF ArgPtr;
-
-  VAR argc-, argv-: LONGINT;
-
-  PROCEDURE -Argc(): INTEGER "SYSTEM_argc";
-  PROCEDURE -Argv(): LONGINT "(long)SYSTEM_argv";
-  PROCEDURE -getenv(var: ARRAY OF CHAR): ArgPtr
-    "(Args_ArgPtr)getenv(var)";
-
-  PROCEDURE Get*(n: INTEGER; VAR val: ARRAY OF CHAR);
-    VAR av: ArgVec;
-  BEGIN
-    IF n < argc THEN av := SYSTEM.VAL(ArgVec, argv); COPY(av[n]^, val) END
-  END Get;
-
-  PROCEDURE GetInt*(n: INTEGER; VAR val: LONGINT);
-    VAR s: ARRAY 64 OF CHAR; k, d, i: LONGINT;
-  BEGIN
-    s := ""; Get(n, s); i := 0;
-    IF s[0] = "-" THEN i := 1 END ;
-    k := 0; d := ORD(s[i]) - ORD("0");
-    WHILE (d >= 0 ) & (d <= 9) DO k := k*10 + d; INC(i); d := ORD(s[i]) - ORD("0") END ;
-    IF s[0] = "-" THEN d := -d; DEC(i) END ;
-    IF i > 0 THEN val := k END
-  END GetInt;
-
-  PROCEDURE Pos*(s: ARRAY OF CHAR): INTEGER;
-    VAR i: INTEGER; arg: ARRAY 256 OF CHAR;
-  BEGIN
-    i := 0; Get(i, arg);
-    WHILE (i < argc) & (s # arg) DO INC(i); Get(i, arg) END ;
-    RETURN i
-  END Pos;
-
-  PROCEDURE GetEnv*(var: ARRAY OF CHAR; VAR val: ARRAY OF CHAR);
-    VAR p: ArgPtr;
-  BEGIN
-    p := getenv(var);
-    IF p # NIL THEN COPY(p^, val) END
-  END GetEnv;
-
-  PROCEDURE getEnv*(var: ARRAY OF CHAR; VAR val: ARRAY OF CHAR): BOOLEAN;
-    VAR p: ArgPtr;
-  BEGIN
-    p := getenv(var);
-    IF p # NIL THEN 
-       COPY(p^, val);
-       RETURN TRUE
-    ELSE
-       RETURN FALSE
-    END
-  END getEnv;
-
-BEGIN argc := Argc(); argv := Argv()
-END Args.
diff --git a/src/lib/system/linux/clang/armv6j_hardfp/Args.Mod b/src/lib/system/linux/clang/armv6j_hardfp/Args.Mod
deleted file mode 100644
index e8cd2a3c..00000000
--- a/src/lib/system/linux/clang/armv6j_hardfp/Args.Mod
+++ /dev/null
@@ -1,64 +0,0 @@
-MODULE Args;  (* jt, 8.12.94 *)
-
-  (* command line argument handling for ofront *)
-
-
-  IMPORT SYSTEM;
-  
-  TYPE
-    ArgPtr = POINTER TO ARRAY 1024 OF CHAR;
-    ArgVec = POINTER TO ARRAY 1024 OF ArgPtr;
-
-  VAR argc-, argv-: LONGINT;
-
-  PROCEDURE -Argc(): INTEGER "SYSTEM_argc";
-  PROCEDURE -Argv(): LONGINT "(long)SYSTEM_argv";
-  PROCEDURE -getenv(var: ARRAY OF CHAR): ArgPtr
-    "(Args_ArgPtr)getenv(var)";
-
-  PROCEDURE Get*(n: INTEGER; VAR val: ARRAY OF CHAR);
-    VAR av: ArgVec;
-  BEGIN
-    IF n < argc THEN av := SYSTEM.VAL(ArgVec, argv); COPY(av[n]^, val) END
-  END Get;
-
-  PROCEDURE GetInt*(n: INTEGER; VAR val: LONGINT);
-    VAR s: ARRAY 64 OF CHAR; k, d, i: LONGINT;
-  BEGIN
-    s := ""; Get(n, s); i := 0;
-    IF s[0] = "-" THEN i := 1 END ;
-    k := 0; d := ORD(s[i]) - ORD("0");
-    WHILE (d >= 0 ) & (d <= 9) DO k := k*10 + d; INC(i); d := ORD(s[i]) - ORD("0") END ;
-    IF s[0] = "-" THEN d := -d; DEC(i) END ;
-    IF i > 0 THEN val := k END
-  END GetInt;
-
-  PROCEDURE Pos*(s: ARRAY OF CHAR): INTEGER;
-    VAR i: INTEGER; arg: ARRAY 256 OF CHAR;
-  BEGIN
-    i := 0; Get(i, arg);
-    WHILE (i < argc) & (s # arg) DO INC(i); Get(i, arg) END ;
-    RETURN i
-  END Pos;
-
-  PROCEDURE GetEnv*(var: ARRAY OF CHAR; VAR val: ARRAY OF CHAR);
-    VAR p: ArgPtr;
-  BEGIN
-    p := getenv(var);
-    IF p # NIL THEN COPY(p^, val) END
-  END GetEnv;
-
-  PROCEDURE getEnv*(var: ARRAY OF CHAR; VAR val: ARRAY OF CHAR): BOOLEAN;
-    VAR p: ArgPtr;
-  BEGIN
-    p := getenv(var);
-    IF p # NIL THEN 
-       COPY(p^, val);
-       RETURN TRUE
-    ELSE
-       RETURN FALSE
-    END
-  END getEnv;
-
-BEGIN argc := Argc(); argv := Argv()
-END Args.
diff --git a/src/lib/system/linux/clang/armv7a_hardfp/Args.Mod b/src/lib/system/linux/clang/armv7a_hardfp/Args.Mod
deleted file mode 100644
index e8cd2a3c..00000000
--- a/src/lib/system/linux/clang/armv7a_hardfp/Args.Mod
+++ /dev/null
@@ -1,64 +0,0 @@
-MODULE Args;  (* jt, 8.12.94 *)
-
-  (* command line argument handling for ofront *)
-
-
-  IMPORT SYSTEM;
-  
-  TYPE
-    ArgPtr = POINTER TO ARRAY 1024 OF CHAR;
-    ArgVec = POINTER TO ARRAY 1024 OF ArgPtr;
-
-  VAR argc-, argv-: LONGINT;
-
-  PROCEDURE -Argc(): INTEGER "SYSTEM_argc";
-  PROCEDURE -Argv(): LONGINT "(long)SYSTEM_argv";
-  PROCEDURE -getenv(var: ARRAY OF CHAR): ArgPtr
-    "(Args_ArgPtr)getenv(var)";
-
-  PROCEDURE Get*(n: INTEGER; VAR val: ARRAY OF CHAR);
-    VAR av: ArgVec;
-  BEGIN
-    IF n < argc THEN av := SYSTEM.VAL(ArgVec, argv); COPY(av[n]^, val) END
-  END Get;
-
-  PROCEDURE GetInt*(n: INTEGER; VAR val: LONGINT);
-    VAR s: ARRAY 64 OF CHAR; k, d, i: LONGINT;
-  BEGIN
-    s := ""; Get(n, s); i := 0;
-    IF s[0] = "-" THEN i := 1 END ;
-    k := 0; d := ORD(s[i]) - ORD("0");
-    WHILE (d >= 0 ) & (d <= 9) DO k := k*10 + d; INC(i); d := ORD(s[i]) - ORD("0") END ;
-    IF s[0] = "-" THEN d := -d; DEC(i) END ;
-    IF i > 0 THEN val := k END
-  END GetInt;
-
-  PROCEDURE Pos*(s: ARRAY OF CHAR): INTEGER;
-    VAR i: INTEGER; arg: ARRAY 256 OF CHAR;
-  BEGIN
-    i := 0; Get(i, arg);
-    WHILE (i < argc) & (s # arg) DO INC(i); Get(i, arg) END ;
-    RETURN i
-  END Pos;
-
-  PROCEDURE GetEnv*(var: ARRAY OF CHAR; VAR val: ARRAY OF CHAR);
-    VAR p: ArgPtr;
-  BEGIN
-    p := getenv(var);
-    IF p # NIL THEN COPY(p^, val) END
-  END GetEnv;
-
-  PROCEDURE getEnv*(var: ARRAY OF CHAR; VAR val: ARRAY OF CHAR): BOOLEAN;
-    VAR p: ArgPtr;
-  BEGIN
-    p := getenv(var);
-    IF p # NIL THEN 
-       COPY(p^, val);
-       RETURN TRUE
-    ELSE
-       RETURN FALSE
-    END
-  END getEnv;
-
-BEGIN argc := Argc(); argv := Argv()
-END Args.
diff --git a/src/lib/system/linux/clang/powerpc/Args.Mod b/src/lib/system/linux/clang/powerpc/Args.Mod
deleted file mode 100644
index e8cd2a3c..00000000
--- a/src/lib/system/linux/clang/powerpc/Args.Mod
+++ /dev/null
@@ -1,64 +0,0 @@
-MODULE Args;  (* jt, 8.12.94 *)
-
-  (* command line argument handling for ofront *)
-
-
-  IMPORT SYSTEM;
-  
-  TYPE
-    ArgPtr = POINTER TO ARRAY 1024 OF CHAR;
-    ArgVec = POINTER TO ARRAY 1024 OF ArgPtr;
-
-  VAR argc-, argv-: LONGINT;
-
-  PROCEDURE -Argc(): INTEGER "SYSTEM_argc";
-  PROCEDURE -Argv(): LONGINT "(long)SYSTEM_argv";
-  PROCEDURE -getenv(var: ARRAY OF CHAR): ArgPtr
-    "(Args_ArgPtr)getenv(var)";
-
-  PROCEDURE Get*(n: INTEGER; VAR val: ARRAY OF CHAR);
-    VAR av: ArgVec;
-  BEGIN
-    IF n < argc THEN av := SYSTEM.VAL(ArgVec, argv); COPY(av[n]^, val) END
-  END Get;
-
-  PROCEDURE GetInt*(n: INTEGER; VAR val: LONGINT);
-    VAR s: ARRAY 64 OF CHAR; k, d, i: LONGINT;
-  BEGIN
-    s := ""; Get(n, s); i := 0;
-    IF s[0] = "-" THEN i := 1 END ;
-    k := 0; d := ORD(s[i]) - ORD("0");
-    WHILE (d >= 0 ) & (d <= 9) DO k := k*10 + d; INC(i); d := ORD(s[i]) - ORD("0") END ;
-    IF s[0] = "-" THEN d := -d; DEC(i) END ;
-    IF i > 0 THEN val := k END
-  END GetInt;
-
-  PROCEDURE Pos*(s: ARRAY OF CHAR): INTEGER;
-    VAR i: INTEGER; arg: ARRAY 256 OF CHAR;
-  BEGIN
-    i := 0; Get(i, arg);
-    WHILE (i < argc) & (s # arg) DO INC(i); Get(i, arg) END ;
-    RETURN i
-  END Pos;
-
-  PROCEDURE GetEnv*(var: ARRAY OF CHAR; VAR val: ARRAY OF CHAR);
-    VAR p: ArgPtr;
-  BEGIN
-    p := getenv(var);
-    IF p # NIL THEN COPY(p^, val) END
-  END GetEnv;
-
-  PROCEDURE getEnv*(var: ARRAY OF CHAR; VAR val: ARRAY OF CHAR): BOOLEAN;
-    VAR p: ArgPtr;
-  BEGIN
-    p := getenv(var);
-    IF p # NIL THEN 
-       COPY(p^, val);
-       RETURN TRUE
-    ELSE
-       RETURN FALSE
-    END
-  END getEnv;
-
-BEGIN argc := Argc(); argv := Argv()
-END Args.
diff --git a/src/lib/system/linux/clang/x86/Args.Mod b/src/lib/system/linux/clang/x86/Args.Mod
deleted file mode 100644
index e8cd2a3c..00000000
--- a/src/lib/system/linux/clang/x86/Args.Mod
+++ /dev/null
@@ -1,64 +0,0 @@
-MODULE Args;  (* jt, 8.12.94 *)
-
-  (* command line argument handling for ofront *)
-
-
-  IMPORT SYSTEM;
-  
-  TYPE
-    ArgPtr = POINTER TO ARRAY 1024 OF CHAR;
-    ArgVec = POINTER TO ARRAY 1024 OF ArgPtr;
-
-  VAR argc-, argv-: LONGINT;
-
-  PROCEDURE -Argc(): INTEGER "SYSTEM_argc";
-  PROCEDURE -Argv(): LONGINT "(long)SYSTEM_argv";
-  PROCEDURE -getenv(var: ARRAY OF CHAR): ArgPtr
-    "(Args_ArgPtr)getenv(var)";
-
-  PROCEDURE Get*(n: INTEGER; VAR val: ARRAY OF CHAR);
-    VAR av: ArgVec;
-  BEGIN
-    IF n < argc THEN av := SYSTEM.VAL(ArgVec, argv); COPY(av[n]^, val) END
-  END Get;
-
-  PROCEDURE GetInt*(n: INTEGER; VAR val: LONGINT);
-    VAR s: ARRAY 64 OF CHAR; k, d, i: LONGINT;
-  BEGIN
-    s := ""; Get(n, s); i := 0;
-    IF s[0] = "-" THEN i := 1 END ;
-    k := 0; d := ORD(s[i]) - ORD("0");
-    WHILE (d >= 0 ) & (d <= 9) DO k := k*10 + d; INC(i); d := ORD(s[i]) - ORD("0") END ;
-    IF s[0] = "-" THEN d := -d; DEC(i) END ;
-    IF i > 0 THEN val := k END
-  END GetInt;
-
-  PROCEDURE Pos*(s: ARRAY OF CHAR): INTEGER;
-    VAR i: INTEGER; arg: ARRAY 256 OF CHAR;
-  BEGIN
-    i := 0; Get(i, arg);
-    WHILE (i < argc) & (s # arg) DO INC(i); Get(i, arg) END ;
-    RETURN i
-  END Pos;
-
-  PROCEDURE GetEnv*(var: ARRAY OF CHAR; VAR val: ARRAY OF CHAR);
-    VAR p: ArgPtr;
-  BEGIN
-    p := getenv(var);
-    IF p # NIL THEN COPY(p^, val) END
-  END GetEnv;
-
-  PROCEDURE getEnv*(var: ARRAY OF CHAR; VAR val: ARRAY OF CHAR): BOOLEAN;
-    VAR p: ArgPtr;
-  BEGIN
-    p := getenv(var);
-    IF p # NIL THEN 
-       COPY(p^, val);
-       RETURN TRUE
-    ELSE
-       RETURN FALSE
-    END
-  END getEnv;
-
-BEGIN argc := Argc(); argv := Argv()
-END Args.
diff --git a/src/lib/system/linux/gcc/x86_64/Args.Mod b/src/lib/system/linux/gcc/Args.Mod
similarity index 100%
rename from src/lib/system/linux/gcc/x86_64/Args.Mod
rename to src/lib/system/linux/gcc/Args.Mod
diff --git a/src/lib/system/linux/gcc/armv6j/Args.Mod b/src/lib/system/linux/gcc/armv6j/Args.Mod
deleted file mode 100644
index e8cd2a3c..00000000
--- a/src/lib/system/linux/gcc/armv6j/Args.Mod
+++ /dev/null
@@ -1,64 +0,0 @@
-MODULE Args;  (* jt, 8.12.94 *)
-
-  (* command line argument handling for ofront *)
-
-
-  IMPORT SYSTEM;
-  
-  TYPE
-    ArgPtr = POINTER TO ARRAY 1024 OF CHAR;
-    ArgVec = POINTER TO ARRAY 1024 OF ArgPtr;
-
-  VAR argc-, argv-: LONGINT;
-
-  PROCEDURE -Argc(): INTEGER "SYSTEM_argc";
-  PROCEDURE -Argv(): LONGINT "(long)SYSTEM_argv";
-  PROCEDURE -getenv(var: ARRAY OF CHAR): ArgPtr
-    "(Args_ArgPtr)getenv(var)";
-
-  PROCEDURE Get*(n: INTEGER; VAR val: ARRAY OF CHAR);
-    VAR av: ArgVec;
-  BEGIN
-    IF n < argc THEN av := SYSTEM.VAL(ArgVec, argv); COPY(av[n]^, val) END
-  END Get;
-
-  PROCEDURE GetInt*(n: INTEGER; VAR val: LONGINT);
-    VAR s: ARRAY 64 OF CHAR; k, d, i: LONGINT;
-  BEGIN
-    s := ""; Get(n, s); i := 0;
-    IF s[0] = "-" THEN i := 1 END ;
-    k := 0; d := ORD(s[i]) - ORD("0");
-    WHILE (d >= 0 ) & (d <= 9) DO k := k*10 + d; INC(i); d := ORD(s[i]) - ORD("0") END ;
-    IF s[0] = "-" THEN d := -d; DEC(i) END ;
-    IF i > 0 THEN val := k END
-  END GetInt;
-
-  PROCEDURE Pos*(s: ARRAY OF CHAR): INTEGER;
-    VAR i: INTEGER; arg: ARRAY 256 OF CHAR;
-  BEGIN
-    i := 0; Get(i, arg);
-    WHILE (i < argc) & (s # arg) DO INC(i); Get(i, arg) END ;
-    RETURN i
-  END Pos;
-
-  PROCEDURE GetEnv*(var: ARRAY OF CHAR; VAR val: ARRAY OF CHAR);
-    VAR p: ArgPtr;
-  BEGIN
-    p := getenv(var);
-    IF p # NIL THEN COPY(p^, val) END
-  END GetEnv;
-
-  PROCEDURE getEnv*(var: ARRAY OF CHAR; VAR val: ARRAY OF CHAR): BOOLEAN;
-    VAR p: ArgPtr;
-  BEGIN
-    p := getenv(var);
-    IF p # NIL THEN 
-       COPY(p^, val);
-       RETURN TRUE
-    ELSE
-       RETURN FALSE
-    END
-  END getEnv;
-
-BEGIN argc := Argc(); argv := Argv()
-END Args.
diff --git a/src/lib/system/linux/gcc/armv6j_hardfp/Args.Mod b/src/lib/system/linux/gcc/armv6j_hardfp/Args.Mod
deleted file mode 100644
index e8cd2a3c..00000000
--- a/src/lib/system/linux/gcc/armv6j_hardfp/Args.Mod
+++ /dev/null
@@ -1,64 +0,0 @@
-MODULE Args;  (* jt, 8.12.94 *)
-
-  (* command line argument handling for ofront *)
-
-
-  IMPORT SYSTEM;
-  
-  TYPE
-    ArgPtr = POINTER TO ARRAY 1024 OF CHAR;
-    ArgVec = POINTER TO ARRAY 1024 OF ArgPtr;
-
-  VAR argc-, argv-: LONGINT;
-
-  PROCEDURE -Argc(): INTEGER "SYSTEM_argc";
-  PROCEDURE -Argv(): LONGINT "(long)SYSTEM_argv";
-  PROCEDURE -getenv(var: ARRAY OF CHAR): ArgPtr
-    "(Args_ArgPtr)getenv(var)";
-
-  PROCEDURE Get*(n: INTEGER; VAR val: ARRAY OF CHAR);
-    VAR av: ArgVec;
-  BEGIN
-    IF n < argc THEN av := SYSTEM.VAL(ArgVec, argv); COPY(av[n]^, val) END
-  END Get;
-
-  PROCEDURE GetInt*(n: INTEGER; VAR val: LONGINT);
-    VAR s: ARRAY 64 OF CHAR; k, d, i: LONGINT;
-  BEGIN
-    s := ""; Get(n, s); i := 0;
-    IF s[0] = "-" THEN i := 1 END ;
-    k := 0; d := ORD(s[i]) - ORD("0");
-    WHILE (d >= 0 ) & (d <= 9) DO k := k*10 + d; INC(i); d := ORD(s[i]) - ORD("0") END ;
-    IF s[0] = "-" THEN d := -d; DEC(i) END ;
-    IF i > 0 THEN val := k END
-  END GetInt;
-
-  PROCEDURE Pos*(s: ARRAY OF CHAR): INTEGER;
-    VAR i: INTEGER; arg: ARRAY 256 OF CHAR;
-  BEGIN
-    i := 0; Get(i, arg);
-    WHILE (i < argc) & (s # arg) DO INC(i); Get(i, arg) END ;
-    RETURN i
-  END Pos;
-
-  PROCEDURE GetEnv*(var: ARRAY OF CHAR; VAR val: ARRAY OF CHAR);
-    VAR p: ArgPtr;
-  BEGIN
-    p := getenv(var);
-    IF p # NIL THEN COPY(p^, val) END
-  END GetEnv;
-
-  PROCEDURE getEnv*(var: ARRAY OF CHAR; VAR val: ARRAY OF CHAR): BOOLEAN;
-    VAR p: ArgPtr;
-  BEGIN
-    p := getenv(var);
-    IF p # NIL THEN 
-       COPY(p^, val);
-       RETURN TRUE
-    ELSE
-       RETURN FALSE
-    END
-  END getEnv;
-
-BEGIN argc := Argc(); argv := Argv()
-END Args.
diff --git a/src/lib/system/linux/gcc/armv7a_hardfp/Args.Mod b/src/lib/system/linux/gcc/armv7a_hardfp/Args.Mod
deleted file mode 100644
index e8cd2a3c..00000000
--- a/src/lib/system/linux/gcc/armv7a_hardfp/Args.Mod
+++ /dev/null
@@ -1,64 +0,0 @@
-MODULE Args;  (* jt, 8.12.94 *)
-
-  (* command line argument handling for ofront *)
-
-
-  IMPORT SYSTEM;
-  
-  TYPE
-    ArgPtr = POINTER TO ARRAY 1024 OF CHAR;
-    ArgVec = POINTER TO ARRAY 1024 OF ArgPtr;
-
-  VAR argc-, argv-: LONGINT;
-
-  PROCEDURE -Argc(): INTEGER "SYSTEM_argc";
-  PROCEDURE -Argv(): LONGINT "(long)SYSTEM_argv";
-  PROCEDURE -getenv(var: ARRAY OF CHAR): ArgPtr
-    "(Args_ArgPtr)getenv(var)";
-
-  PROCEDURE Get*(n: INTEGER; VAR val: ARRAY OF CHAR);
-    VAR av: ArgVec;
-  BEGIN
-    IF n < argc THEN av := SYSTEM.VAL(ArgVec, argv); COPY(av[n]^, val) END
-  END Get;
-
-  PROCEDURE GetInt*(n: INTEGER; VAR val: LONGINT);
-    VAR s: ARRAY 64 OF CHAR; k, d, i: LONGINT;
-  BEGIN
-    s := ""; Get(n, s); i := 0;
-    IF s[0] = "-" THEN i := 1 END ;
-    k := 0; d := ORD(s[i]) - ORD("0");
-    WHILE (d >= 0 ) & (d <= 9) DO k := k*10 + d; INC(i); d := ORD(s[i]) - ORD("0") END ;
-    IF s[0] = "-" THEN d := -d; DEC(i) END ;
-    IF i > 0 THEN val := k END
-  END GetInt;
-
-  PROCEDURE Pos*(s: ARRAY OF CHAR): INTEGER;
-    VAR i: INTEGER; arg: ARRAY 256 OF CHAR;
-  BEGIN
-    i := 0; Get(i, arg);
-    WHILE (i < argc) & (s # arg) DO INC(i); Get(i, arg) END ;
-    RETURN i
-  END Pos;
-
-  PROCEDURE GetEnv*(var: ARRAY OF CHAR; VAR val: ARRAY OF CHAR);
-    VAR p: ArgPtr;
-  BEGIN
-    p := getenv(var);
-    IF p # NIL THEN COPY(p^, val) END
-  END GetEnv;
-
-  PROCEDURE getEnv*(var: ARRAY OF CHAR; VAR val: ARRAY OF CHAR): BOOLEAN;
-    VAR p: ArgPtr;
-  BEGIN
-    p := getenv(var);
-    IF p # NIL THEN 
-       COPY(p^, val);
-       RETURN TRUE
-    ELSE
-       RETURN FALSE
-    END
-  END getEnv;
-
-BEGIN argc := Argc(); argv := Argv()
-END Args.
diff --git a/src/lib/system/linux/gcc/powerpc/Args.Mod b/src/lib/system/linux/gcc/powerpc/Args.Mod
deleted file mode 100644
index e8cd2a3c..00000000
--- a/src/lib/system/linux/gcc/powerpc/Args.Mod
+++ /dev/null
@@ -1,64 +0,0 @@
-MODULE Args;  (* jt, 8.12.94 *)
-
-  (* command line argument handling for ofront *)
-
-
-  IMPORT SYSTEM;
-  
-  TYPE
-    ArgPtr = POINTER TO ARRAY 1024 OF CHAR;
-    ArgVec = POINTER TO ARRAY 1024 OF ArgPtr;
-
-  VAR argc-, argv-: LONGINT;
-
-  PROCEDURE -Argc(): INTEGER "SYSTEM_argc";
-  PROCEDURE -Argv(): LONGINT "(long)SYSTEM_argv";
-  PROCEDURE -getenv(var: ARRAY OF CHAR): ArgPtr
-    "(Args_ArgPtr)getenv(var)";
-
-  PROCEDURE Get*(n: INTEGER; VAR val: ARRAY OF CHAR);
-    VAR av: ArgVec;
-  BEGIN
-    IF n < argc THEN av := SYSTEM.VAL(ArgVec, argv); COPY(av[n]^, val) END
-  END Get;
-
-  PROCEDURE GetInt*(n: INTEGER; VAR val: LONGINT);
-    VAR s: ARRAY 64 OF CHAR; k, d, i: LONGINT;
-  BEGIN
-    s := ""; Get(n, s); i := 0;
-    IF s[0] = "-" THEN i := 1 END ;
-    k := 0; d := ORD(s[i]) - ORD("0");
-    WHILE (d >= 0 ) & (d <= 9) DO k := k*10 + d; INC(i); d := ORD(s[i]) - ORD("0") END ;
-    IF s[0] = "-" THEN d := -d; DEC(i) END ;
-    IF i > 0 THEN val := k END
-  END GetInt;
-
-  PROCEDURE Pos*(s: ARRAY OF CHAR): INTEGER;
-    VAR i: INTEGER; arg: ARRAY 256 OF CHAR;
-  BEGIN
-    i := 0; Get(i, arg);
-    WHILE (i < argc) & (s # arg) DO INC(i); Get(i, arg) END ;
-    RETURN i
-  END Pos;
-
-  PROCEDURE GetEnv*(var: ARRAY OF CHAR; VAR val: ARRAY OF CHAR);
-    VAR p: ArgPtr;
-  BEGIN
-    p := getenv(var);
-    IF p # NIL THEN COPY(p^, val) END
-  END GetEnv;
-
-  PROCEDURE getEnv*(var: ARRAY OF CHAR; VAR val: ARRAY OF CHAR): BOOLEAN;
-    VAR p: ArgPtr;
-  BEGIN
-    p := getenv(var);
-    IF p # NIL THEN 
-       COPY(p^, val);
-       RETURN TRUE
-    ELSE
-       RETURN FALSE
-    END
-  END getEnv;
-
-BEGIN argc := Argc(); argv := Argv()
-END Args.
diff --git a/src/lib/system/linux/gcc/x86/Args.Mod b/src/lib/system/linux/gcc/x86/Args.Mod
deleted file mode 100644
index e8cd2a3c..00000000
--- a/src/lib/system/linux/gcc/x86/Args.Mod
+++ /dev/null
@@ -1,64 +0,0 @@
-MODULE Args;  (* jt, 8.12.94 *)
-
-  (* command line argument handling for ofront *)
-
-
-  IMPORT SYSTEM;
-  
-  TYPE
-    ArgPtr = POINTER TO ARRAY 1024 OF CHAR;
-    ArgVec = POINTER TO ARRAY 1024 OF ArgPtr;
-
-  VAR argc-, argv-: LONGINT;
-
-  PROCEDURE -Argc(): INTEGER "SYSTEM_argc";
-  PROCEDURE -Argv(): LONGINT "(long)SYSTEM_argv";
-  PROCEDURE -getenv(var: ARRAY OF CHAR): ArgPtr
-    "(Args_ArgPtr)getenv(var)";
-
-  PROCEDURE Get*(n: INTEGER; VAR val: ARRAY OF CHAR);
-    VAR av: ArgVec;
-  BEGIN
-    IF n < argc THEN av := SYSTEM.VAL(ArgVec, argv); COPY(av[n]^, val) END
-  END Get;
-
-  PROCEDURE GetInt*(n: INTEGER; VAR val: LONGINT);
-    VAR s: ARRAY 64 OF CHAR; k, d, i: LONGINT;
-  BEGIN
-    s := ""; Get(n, s); i := 0;
-    IF s[0] = "-" THEN i := 1 END ;
-    k := 0; d := ORD(s[i]) - ORD("0");
-    WHILE (d >= 0 ) & (d <= 9) DO k := k*10 + d; INC(i); d := ORD(s[i]) - ORD("0") END ;
-    IF s[0] = "-" THEN d := -d; DEC(i) END ;
-    IF i > 0 THEN val := k END
-  END GetInt;
-
-  PROCEDURE Pos*(s: ARRAY OF CHAR): INTEGER;
-    VAR i: INTEGER; arg: ARRAY 256 OF CHAR;
-  BEGIN
-    i := 0; Get(i, arg);
-    WHILE (i < argc) & (s # arg) DO INC(i); Get(i, arg) END ;
-    RETURN i
-  END Pos;
-
-  PROCEDURE GetEnv*(var: ARRAY OF CHAR; VAR val: ARRAY OF CHAR);
-    VAR p: ArgPtr;
-  BEGIN
-    p := getenv(var);
-    IF p # NIL THEN COPY(p^, val) END
-  END GetEnv;
-
-  PROCEDURE getEnv*(var: ARRAY OF CHAR; VAR val: ARRAY OF CHAR): BOOLEAN;
-    VAR p: ArgPtr;
-  BEGIN
-    p := getenv(var);
-    IF p # NIL THEN 
-       COPY(p^, val);
-       RETURN TRUE
-    ELSE
-       RETURN FALSE
-    END
-  END getEnv;
-
-BEGIN argc := Argc(); argv := Argv()
-END Args.