diff --git a/bootstrap/unix-44/Compiler.c b/bootstrap/unix-44/Compiler.c
index dc4bb660..e900905f 100644
--- a/bootstrap/unix-44/Compiler.c
+++ b/bootstrap/unix-44/Compiler.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. xtspamS */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. xtspamS */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/unix-44/Configuration.c b/bootstrap/unix-44/Configuration.c
index 2d0061df..071d7b8e 100644
--- a/bootstrap/unix-44/Configuration.c
+++ b/bootstrap/unix-44/Configuration.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
@@ -19,6 +19,6 @@ export void *Configuration__init(void)
 	__DEFMOD;
 	__REGMOD("Configuration", 0);
 /* BEGIN */
-	__MOVE("1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8.", Configuration_versionLong, 75);
+	__MOVE("2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8.", Configuration_versionLong, 75);
 	__ENDMOD;
 }
diff --git a/bootstrap/unix-44/Configuration.h b/bootstrap/unix-44/Configuration.h
index b28e0caa..b1942442 100644
--- a/bootstrap/unix-44/Configuration.h
+++ b/bootstrap/unix-44/Configuration.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef Configuration__h
 #define Configuration__h
diff --git a/bootstrap/unix-44/Files.c b/bootstrap/unix-44/Files.c
index 548774b0..0a3293ab 100644
--- a/bootstrap/unix-44/Files.c
+++ b/bootstrap/unix-44/Files.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. tspaSF */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. tspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
@@ -52,7 +52,7 @@ static Files_File Files_files;
 static INT16 Files_tempno;
 static CHAR Files_HOME[1024];
 static struct {
-	LONGINT len[1];
+	ADDRESS len[1];
 	CHAR data[1];
 } *Files_SearchPath;
 
@@ -62,56 +62,56 @@ export ADDRESS *Files_Rider__typ;
 
 export Files_File Files_Base (Files_Rider *r, ADDRESS *r__typ);
 static Files_File Files_CacheEntry (Platform_FileIdentity identity);
-export void Files_ChangeDirectory (CHAR *path, LONGINT path__len, INT16 *res);
+export void Files_ChangeDirectory (CHAR *path, ADDRESS path__len, INT16 *res);
 export void Files_Close (Files_File f);
 static void Files_CloseOSFile (Files_File f);
 static void Files_Create (Files_File f);
-export void Files_Delete (CHAR *name, LONGINT name__len, INT16 *res);
-static void Files_Err (CHAR *s, LONGINT s__len, Files_File f, INT16 errcode);
+export void Files_Delete (CHAR *name, ADDRESS name__len, INT16 *res);
+static void Files_Err (CHAR *s, ADDRESS s__len, Files_File f, INT16 errcode);
 static void Files_Finalize (SYSTEM_PTR o);
-static void Files_FlipBytes (SYSTEM_BYTE *src, LONGINT src__len, SYSTEM_BYTE *dest, LONGINT dest__len);
+static void Files_FlipBytes (SYSTEM_BYTE *src, ADDRESS src__len, SYSTEM_BYTE *dest, ADDRESS dest__len);
 static void Files_Flush (Files_Buffer buf);
 export void Files_GetDate (Files_File f, INT32 *t, INT32 *d);
-export void Files_GetName (Files_File f, CHAR *name, LONGINT name__len);
-static void Files_GetTempName (CHAR *finalName, LONGINT finalName__len, CHAR *name, LONGINT name__len);
-static BOOLEAN Files_HasDir (CHAR *name, LONGINT name__len);
+export void Files_GetName (Files_File f, CHAR *name, ADDRESS name__len);
+static void Files_GetTempName (CHAR *finalName, ADDRESS finalName__len, CHAR *name, ADDRESS name__len);
+static BOOLEAN Files_HasDir (CHAR *name, ADDRESS name__len);
 export INT32 Files_Length (Files_File f);
-static void Files_MakeFileName (CHAR *dir, LONGINT dir__len, CHAR *name, LONGINT name__len, CHAR *dest, LONGINT dest__len);
-export Files_File Files_New (CHAR *name, LONGINT name__len);
-export Files_File Files_Old (CHAR *name, LONGINT name__len);
+static void Files_MakeFileName (CHAR *dir, ADDRESS dir__len, CHAR *name, ADDRESS name__len, CHAR *dest, ADDRESS dest__len);
+export Files_File Files_New (CHAR *name, ADDRESS name__len);
+export Files_File Files_Old (CHAR *name, ADDRESS name__len);
 export INT32 Files_Pos (Files_Rider *r, ADDRESS *r__typ);
 export void Files_Purge (Files_File f);
 export void Files_Read (Files_Rider *r, ADDRESS *r__typ, SYSTEM_BYTE *x);
 export void Files_ReadBool (Files_Rider *R, ADDRESS *R__typ, BOOLEAN *x);
-export void Files_ReadBytes (Files_Rider *r, ADDRESS *r__typ, SYSTEM_BYTE *x, LONGINT x__len, INT32 n);
+export void Files_ReadBytes (Files_Rider *r, ADDRESS *r__typ, SYSTEM_BYTE *x, ADDRESS x__len, INT32 n);
 export void Files_ReadInt (Files_Rider *R, ADDRESS *R__typ, INT16 *x);
 export void Files_ReadLInt (Files_Rider *R, ADDRESS *R__typ, INT32 *x);
 export void Files_ReadLReal (Files_Rider *R, ADDRESS *R__typ, LONGREAL *x);
-export void Files_ReadLine (Files_Rider *R, ADDRESS *R__typ, CHAR *x, LONGINT x__len);
-export void Files_ReadNum (Files_Rider *R, ADDRESS *R__typ, SYSTEM_BYTE *x, LONGINT x__len);
+export void Files_ReadLine (Files_Rider *R, ADDRESS *R__typ, CHAR *x, ADDRESS x__len);
+export void Files_ReadNum (Files_Rider *R, ADDRESS *R__typ, SYSTEM_BYTE *x, ADDRESS x__len);
 export void Files_ReadReal (Files_Rider *R, ADDRESS *R__typ, REAL *x);
 export void Files_ReadSet (Files_Rider *R, ADDRESS *R__typ, UINT32 *x);
-export void Files_ReadString (Files_Rider *R, ADDRESS *R__typ, CHAR *x, LONGINT x__len);
+export void Files_ReadString (Files_Rider *R, ADDRESS *R__typ, CHAR *x, ADDRESS x__len);
 export void Files_Register (Files_File f);
-export void Files_Rename (CHAR *old, LONGINT old__len, CHAR *new, LONGINT new__len, INT16 *res);
-static void Files_ScanPath (INT16 *pos, CHAR *dir, LONGINT dir__len);
+export void Files_Rename (CHAR *old, ADDRESS old__len, CHAR *new, ADDRESS new__len, INT16 *res);
+static void Files_ScanPath (INT16 *pos, CHAR *dir, ADDRESS dir__len);
 export void Files_Set (Files_Rider *r, ADDRESS *r__typ, Files_File f, INT32 pos);
-export void Files_SetSearchPath (CHAR *path, LONGINT path__len);
+export void Files_SetSearchPath (CHAR *path, ADDRESS path__len);
 export void Files_Write (Files_Rider *r, ADDRESS *r__typ, SYSTEM_BYTE x);
 export void Files_WriteBool (Files_Rider *R, ADDRESS *R__typ, BOOLEAN x);
-export void Files_WriteBytes (Files_Rider *r, ADDRESS *r__typ, SYSTEM_BYTE *x, LONGINT x__len, INT32 n);
+export void Files_WriteBytes (Files_Rider *r, ADDRESS *r__typ, SYSTEM_BYTE *x, ADDRESS x__len, INT32 n);
 export void Files_WriteInt (Files_Rider *R, ADDRESS *R__typ, INT16 x);
 export void Files_WriteLInt (Files_Rider *R, ADDRESS *R__typ, INT32 x);
 export void Files_WriteLReal (Files_Rider *R, ADDRESS *R__typ, LONGREAL x);
 export void Files_WriteNum (Files_Rider *R, ADDRESS *R__typ, INT64 x);
 export void Files_WriteReal (Files_Rider *R, ADDRESS *R__typ, REAL x);
 export void Files_WriteSet (Files_Rider *R, ADDRESS *R__typ, UINT32 x);
-export void Files_WriteString (Files_Rider *R, ADDRESS *R__typ, CHAR *x, LONGINT x__len);
+export void Files_WriteString (Files_Rider *R, ADDRESS *R__typ, CHAR *x, ADDRESS x__len);
 
 #define Files_IdxTrap()	__HALT(-1)
 #define Files_ToAdr(x)	(ADDRESS)x
 
-static void Files_Err (CHAR *s, LONGINT s__len, Files_File f, INT16 errcode)
+static void Files_Err (CHAR *s, ADDRESS s__len, Files_File f, INT16 errcode)
 {
 	__DUP(s, s__len, CHAR);
 	Out_Ln();
@@ -138,7 +138,7 @@ static void Files_Err (CHAR *s, LONGINT s__len, Files_File f, INT16 errcode)
 	__DEL(s);
 }
 
-static void Files_MakeFileName (CHAR *dir, LONGINT dir__len, CHAR *name, LONGINT name__len, CHAR *dest, LONGINT dest__len)
+static void Files_MakeFileName (CHAR *dir, ADDRESS dir__len, CHAR *name, ADDRESS name__len, CHAR *dest, ADDRESS dest__len)
 {
 	INT16 i, j;
 	__DUP(dir, dir__len, CHAR);
@@ -163,7 +163,7 @@ static void Files_MakeFileName (CHAR *dir, LONGINT dir__len, CHAR *name, LONGINT
 	__DEL(name);
 }
 
-static void Files_GetTempName (CHAR *finalName, LONGINT finalName__len, CHAR *name, LONGINT name__len)
+static void Files_GetTempName (CHAR *finalName, ADDRESS finalName__len, CHAR *name, ADDRESS name__len)
 {
 	INT32 n, i, j;
 	__DUP(finalName, finalName__len, CHAR);
@@ -316,7 +316,7 @@ INT32 Files_Length (Files_File f)
 	return f->len;
 }
 
-Files_File Files_New (CHAR *name, LONGINT name__len)
+Files_File Files_New (CHAR *name, ADDRESS name__len)
 {
 	Files_File f = NIL;
 	__DUP(name, name__len, CHAR);
@@ -332,7 +332,7 @@ Files_File Files_New (CHAR *name, LONGINT name__len)
 	return f;
 }
 
-static void Files_ScanPath (INT16 *pos, CHAR *dir, LONGINT dir__len)
+static void Files_ScanPath (INT16 *pos, CHAR *dir, ADDRESS dir__len)
 {
 	INT16 i;
 	CHAR ch;
@@ -375,7 +375,7 @@ static void Files_ScanPath (INT16 *pos, CHAR *dir, LONGINT dir__len)
 	dir[i] = 0x00;
 }
 
-static BOOLEAN Files_HasDir (CHAR *name, LONGINT name__len)
+static BOOLEAN Files_HasDir (CHAR *name, ADDRESS name__len)
 {
 	INT16 i;
 	CHAR ch;
@@ -415,7 +415,7 @@ static Files_File Files_CacheEntry (Platform_FileIdentity identity)
 	return NIL;
 }
 
-Files_File Files_Old (CHAR *name, LONGINT name__len)
+Files_File Files_Old (CHAR *name, ADDRESS name__len)
 {
 	Files_File f = NIL;
 	INT32 fd;
@@ -618,7 +618,7 @@ void Files_Read (Files_Rider *r, ADDRESS *r__typ, SYSTEM_BYTE *x)
 	}
 }
 
-void Files_ReadBytes (Files_Rider *r, ADDRESS *r__typ, SYSTEM_BYTE *x, LONGINT x__len, INT32 n)
+void Files_ReadBytes (Files_Rider *r, ADDRESS *r__typ, SYSTEM_BYTE *x, ADDRESS x__len, INT32 n)
 {
 	INT32 xpos, min, restInBuf, offset;
 	Files_Buffer buf = NIL;
@@ -683,7 +683,7 @@ void Files_Write (Files_Rider *r, ADDRESS *r__typ, SYSTEM_BYTE x)
 	(*r).res = 0;
 }
 
-void Files_WriteBytes (Files_Rider *r, ADDRESS *r__typ, SYSTEM_BYTE *x, LONGINT x__len, INT32 n)
+void Files_WriteBytes (Files_Rider *r, ADDRESS *r__typ, SYSTEM_BYTE *x, ADDRESS x__len, INT32 n)
 {
 	INT32 xpos, min, restInBuf, offset;
 	Files_Buffer buf = NIL;
@@ -722,14 +722,14 @@ void Files_WriteBytes (Files_Rider *r, ADDRESS *r__typ, SYSTEM_BYTE *x, LONGINT
 	(*r).res = 0;
 }
 
-void Files_Delete (CHAR *name, LONGINT name__len, INT16 *res)
+void Files_Delete (CHAR *name, ADDRESS name__len, INT16 *res)
 {
 	__DUP(name, name__len, CHAR);
 	*res = Platform_Unlink((void*)name, name__len);
 	__DEL(name);
 }
 
-void Files_Rename (CHAR *old, LONGINT old__len, CHAR *new, LONGINT new__len, INT16 *res)
+void Files_Rename (CHAR *old, ADDRESS old__len, CHAR *new, ADDRESS new__len, INT16 *res)
 {
 	INT32 fdold, fdnew, n;
 	INT16 error, ignore;
@@ -812,14 +812,14 @@ void Files_Register (Files_File f)
 	}
 }
 
-void Files_ChangeDirectory (CHAR *path, LONGINT path__len, INT16 *res)
+void Files_ChangeDirectory (CHAR *path, ADDRESS path__len, INT16 *res)
 {
 	__DUP(path, path__len, CHAR);
 	*res = Platform_Chdir((void*)path, path__len);
 	__DEL(path);
 }
 
-static void Files_FlipBytes (SYSTEM_BYTE *src, LONGINT src__len, SYSTEM_BYTE *dest, LONGINT dest__len)
+static void Files_FlipBytes (SYSTEM_BYTE *src, ADDRESS src__len, SYSTEM_BYTE *dest, ADDRESS dest__len)
 {
 	INT32 i, j;
 	if (!Platform_LittleEndian) {
@@ -877,7 +877,7 @@ void Files_ReadLReal (Files_Rider *R, ADDRESS *R__typ, LONGREAL *x)
 	Files_FlipBytes((void*)b, 8, (void*)&*x, 8);
 }
 
-void Files_ReadString (Files_Rider *R, ADDRESS *R__typ, CHAR *x, LONGINT x__len)
+void Files_ReadString (Files_Rider *R, ADDRESS *R__typ, CHAR *x, ADDRESS x__len)
 {
 	INT16 i;
 	CHAR ch;
@@ -889,7 +889,7 @@ void Files_ReadString (Files_Rider *R, ADDRESS *R__typ, CHAR *x, LONGINT x__len)
 	} while (!(ch == 0x00));
 }
 
-void Files_ReadLine (Files_Rider *R, ADDRESS *R__typ, CHAR *x, LONGINT x__len)
+void Files_ReadLine (Files_Rider *R, ADDRESS *R__typ, CHAR *x, ADDRESS x__len)
 {
 	INT16 i;
 	i = 0;
@@ -906,7 +906,7 @@ void Files_ReadLine (Files_Rider *R, ADDRESS *R__typ, CHAR *x, LONGINT x__len)
 	x[i] = 0x00;
 }
 
-void Files_ReadNum (Files_Rider *R, ADDRESS *R__typ, SYSTEM_BYTE *x, LONGINT x__len)
+void Files_ReadNum (Files_Rider *R, ADDRESS *R__typ, SYSTEM_BYTE *x, ADDRESS x__len)
 {
 	INT8 s, b;
 	INT64 q;
@@ -972,7 +972,7 @@ void Files_WriteLReal (Files_Rider *R, ADDRESS *R__typ, LONGREAL x)
 	Files_WriteBytes(&*R, R__typ, (void*)b, 8, 8);
 }
 
-void Files_WriteString (Files_Rider *R, ADDRESS *R__typ, CHAR *x, LONGINT x__len)
+void Files_WriteString (Files_Rider *R, ADDRESS *R__typ, CHAR *x, ADDRESS x__len)
 {
 	INT16 i;
 	i = 0;
@@ -991,7 +991,7 @@ void Files_WriteNum (Files_Rider *R, ADDRESS *R__typ, INT64 x)
 	Files_Write(&*R, R__typ, (CHAR)__MASK(x, -128));
 }
 
-void Files_GetName (Files_File f, CHAR *name, LONGINT name__len)
+void Files_GetName (Files_File f, CHAR *name, ADDRESS name__len)
 {
 	__COPY(f->workName, name, name__len);
 }
@@ -1009,7 +1009,7 @@ static void Files_Finalize (SYSTEM_PTR o)
 	}
 }
 
-void Files_SetSearchPath (CHAR *path, LONGINT path__len)
+void Files_SetSearchPath (CHAR *path, ADDRESS path__len)
 {
 	__DUP(path, path__len, CHAR);
 	if (Strings_Length(path, path__len) != 0) {
diff --git a/bootstrap/unix-44/Files.h b/bootstrap/unix-44/Files.h
index 79164af5..1012ec46 100644
--- a/bootstrap/unix-44/Files.h
+++ b/bootstrap/unix-44/Files.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. tspaSF */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. tspaSF */
 
 #ifndef Files__h
 #define Files__h
@@ -28,41 +28,41 @@ import ADDRESS *Files_FileDesc__typ;
 import ADDRESS *Files_Rider__typ;
 
 import Files_File Files_Base (Files_Rider *r, ADDRESS *r__typ);
-import void Files_ChangeDirectory (CHAR *path, LONGINT path__len, INT16 *res);
+import void Files_ChangeDirectory (CHAR *path, ADDRESS path__len, INT16 *res);
 import void Files_Close (Files_File f);
-import void Files_Delete (CHAR *name, LONGINT name__len, INT16 *res);
+import void Files_Delete (CHAR *name, ADDRESS name__len, INT16 *res);
 import void Files_GetDate (Files_File f, INT32 *t, INT32 *d);
-import void Files_GetName (Files_File f, CHAR *name, LONGINT name__len);
+import void Files_GetName (Files_File f, CHAR *name, ADDRESS name__len);
 import INT32 Files_Length (Files_File f);
-import Files_File Files_New (CHAR *name, LONGINT name__len);
-import Files_File Files_Old (CHAR *name, LONGINT name__len);
+import Files_File Files_New (CHAR *name, ADDRESS name__len);
+import Files_File Files_Old (CHAR *name, ADDRESS name__len);
 import INT32 Files_Pos (Files_Rider *r, ADDRESS *r__typ);
 import void Files_Purge (Files_File f);
 import void Files_Read (Files_Rider *r, ADDRESS *r__typ, SYSTEM_BYTE *x);
 import void Files_ReadBool (Files_Rider *R, ADDRESS *R__typ, BOOLEAN *x);
-import void Files_ReadBytes (Files_Rider *r, ADDRESS *r__typ, SYSTEM_BYTE *x, LONGINT x__len, INT32 n);
+import void Files_ReadBytes (Files_Rider *r, ADDRESS *r__typ, SYSTEM_BYTE *x, ADDRESS x__len, INT32 n);
 import void Files_ReadInt (Files_Rider *R, ADDRESS *R__typ, INT16 *x);
 import void Files_ReadLInt (Files_Rider *R, ADDRESS *R__typ, INT32 *x);
 import void Files_ReadLReal (Files_Rider *R, ADDRESS *R__typ, LONGREAL *x);
-import void Files_ReadLine (Files_Rider *R, ADDRESS *R__typ, CHAR *x, LONGINT x__len);
-import void Files_ReadNum (Files_Rider *R, ADDRESS *R__typ, SYSTEM_BYTE *x, LONGINT x__len);
+import void Files_ReadLine (Files_Rider *R, ADDRESS *R__typ, CHAR *x, ADDRESS x__len);
+import void Files_ReadNum (Files_Rider *R, ADDRESS *R__typ, SYSTEM_BYTE *x, ADDRESS x__len);
 import void Files_ReadReal (Files_Rider *R, ADDRESS *R__typ, REAL *x);
 import void Files_ReadSet (Files_Rider *R, ADDRESS *R__typ, UINT32 *x);
-import void Files_ReadString (Files_Rider *R, ADDRESS *R__typ, CHAR *x, LONGINT x__len);
+import void Files_ReadString (Files_Rider *R, ADDRESS *R__typ, CHAR *x, ADDRESS x__len);
 import void Files_Register (Files_File f);
-import void Files_Rename (CHAR *old, LONGINT old__len, CHAR *new, LONGINT new__len, INT16 *res);
+import void Files_Rename (CHAR *old, ADDRESS old__len, CHAR *new, ADDRESS new__len, INT16 *res);
 import void Files_Set (Files_Rider *r, ADDRESS *r__typ, Files_File f, INT32 pos);
-import void Files_SetSearchPath (CHAR *path, LONGINT path__len);
+import void Files_SetSearchPath (CHAR *path, ADDRESS path__len);
 import void Files_Write (Files_Rider *r, ADDRESS *r__typ, SYSTEM_BYTE x);
 import void Files_WriteBool (Files_Rider *R, ADDRESS *R__typ, BOOLEAN x);
-import void Files_WriteBytes (Files_Rider *r, ADDRESS *r__typ, SYSTEM_BYTE *x, LONGINT x__len, INT32 n);
+import void Files_WriteBytes (Files_Rider *r, ADDRESS *r__typ, SYSTEM_BYTE *x, ADDRESS x__len, INT32 n);
 import void Files_WriteInt (Files_Rider *R, ADDRESS *R__typ, INT16 x);
 import void Files_WriteLInt (Files_Rider *R, ADDRESS *R__typ, INT32 x);
 import void Files_WriteLReal (Files_Rider *R, ADDRESS *R__typ, LONGREAL x);
 import void Files_WriteNum (Files_Rider *R, ADDRESS *R__typ, INT64 x);
 import void Files_WriteReal (Files_Rider *R, ADDRESS *R__typ, REAL x);
 import void Files_WriteSet (Files_Rider *R, ADDRESS *R__typ, UINT32 x);
-import void Files_WriteString (Files_Rider *R, ADDRESS *R__typ, CHAR *x, LONGINT x__len);
+import void Files_WriteString (Files_Rider *R, ADDRESS *R__typ, CHAR *x, ADDRESS x__len);
 import void *Files__init(void);
 
 
diff --git a/bootstrap/unix-44/Heap.c b/bootstrap/unix-44/Heap.c
index 72677604..ba769b74 100644
--- a/bootstrap/unix-44/Heap.c
+++ b/bootstrap/unix-44/Heap.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. tsSF */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. tsSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
@@ -85,14 +85,14 @@ static void Heap_ExtendHeap (INT32 blksz);
 export void Heap_FINALL (void);
 static void Heap_Finalize (void);
 export void Heap_GC (BOOLEAN markStack);
-static void Heap_HeapSort (INT32 n, INT32 *a, LONGINT a__len);
+static void Heap_HeapSort (INT32 n, INT32 *a, ADDRESS a__len);
 export void Heap_INCREF (Heap_Module m);
 export void Heap_InitHeap (void);
 export void Heap_Lock (void);
 static void Heap_Mark (INT32 q);
-static void Heap_MarkCandidates (INT32 n, INT32 *cand, LONGINT cand__len);
+static void Heap_MarkCandidates (INT32 n, INT32 *cand, ADDRESS cand__len);
 static void Heap_MarkP (SYSTEM_PTR p);
-static void Heap_MarkStack (INT32 n, INT32 *cand, LONGINT cand__len);
+static void Heap_MarkStack (INT32 n, INT32 *cand, ADDRESS cand__len);
 export SYSTEM_PTR Heap_NEWBLK (INT32 size);
 export SYSTEM_PTR Heap_NEWREC (INT32 tag);
 static INT32 Heap_NewChunk (INT32 blksz);
@@ -101,7 +101,7 @@ export SYSTEM_PTR Heap_REGMOD (Heap_ModuleName name, Heap_EnumProc enumPtrs);
 export void Heap_REGTYP (Heap_Module m, INT32 typ);
 export void Heap_RegisterFinalizer (SYSTEM_PTR obj, Heap_Finalizer finalize);
 static void Heap_Scan (void);
-static void Heap_Sift (INT32 l, INT32 r, INT32 *a, LONGINT a__len);
+static void Heap_Sift (INT32 l, INT32 r, INT32 *a, ADDRESS a__len);
 export void Heap_Unlock (void);
 
 extern void *Heap__init();
@@ -445,7 +445,7 @@ static void Heap_Scan (void)
 	}
 }
 
-static void Heap_Sift (INT32 l, INT32 r, INT32 *a, LONGINT a__len)
+static void Heap_Sift (INT32 l, INT32 r, INT32 *a, ADDRESS a__len)
 {
 	INT32 i, j, x;
 	j = l;
@@ -464,7 +464,7 @@ static void Heap_Sift (INT32 l, INT32 r, INT32 *a, LONGINT a__len)
 	a[i] = x;
 }
 
-static void Heap_HeapSort (INT32 n, INT32 *a, LONGINT a__len)
+static void Heap_HeapSort (INT32 n, INT32 *a, ADDRESS a__len)
 {
 	INT32 l, r, x;
 	l = __ASHR(n, 1);
@@ -482,7 +482,7 @@ static void Heap_HeapSort (INT32 n, INT32 *a, LONGINT a__len)
 	}
 }
 
-static void Heap_MarkCandidates (INT32 n, INT32 *cand, LONGINT cand__len)
+static void Heap_MarkCandidates (INT32 n, INT32 *cand, ADDRESS cand__len)
 {
 	INT32 chnk, adr, tag, next, lim, lim1, i, ptr, size;
 	chnk = Heap_heap;
@@ -571,7 +571,7 @@ void Heap_FINALL (void)
 	}
 }
 
-static void Heap_MarkStack (INT32 n, INT32 *cand, LONGINT cand__len)
+static void Heap_MarkStack (INT32 n, INT32 *cand, ADDRESS cand__len)
 {
 	SYSTEM_PTR frame;
 	INT32 inc, nofcand, sp, p, stack0;
diff --git a/bootstrap/unix-44/Heap.h b/bootstrap/unix-44/Heap.h
index 0aa0a18b..d200254d 100644
--- a/bootstrap/unix-44/Heap.h
+++ b/bootstrap/unix-44/Heap.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. tsSF */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. tsSF */
 
 #ifndef Heap__h
 #define Heap__h
diff --git a/bootstrap/unix-44/Modules.c b/bootstrap/unix-44/Modules.c
index a5e72ba3..27e4473c 100644
--- a/bootstrap/unix-44/Modules.c
+++ b/bootstrap/unix-44/Modules.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
@@ -47,21 +47,21 @@ export Modules_ModuleName Modules_imported, Modules_importing;
 export ADDRESS *Modules_ModuleDesc__typ;
 export ADDRESS *Modules_CmdDesc__typ;
 
-static void Modules_Append (CHAR *a, LONGINT a__len, CHAR *b, LONGINT b__len);
+static void Modules_Append (CHAR *a, ADDRESS a__len, CHAR *b, ADDRESS b__len);
 export void Modules_AssertFail (INT32 code);
 static void Modules_DisplayHaltCode (INT32 code);
-export void Modules_Free (CHAR *name, LONGINT name__len, BOOLEAN all);
+export void Modules_Free (CHAR *name, ADDRESS name__len, BOOLEAN all);
 export void Modules_Halt (INT32 code);
-export Modules_Command Modules_ThisCommand (Modules_Module mod, CHAR *name, LONGINT name__len);
-export Modules_Module Modules_ThisMod (CHAR *name, LONGINT name__len);
+export Modules_Command Modules_ThisCommand (Modules_Module mod, CHAR *name, ADDRESS name__len);
+export Modules_Module Modules_ThisMod (CHAR *name, ADDRESS name__len);
 static void Modules_errch (CHAR c);
 static void Modules_errint (INT32 l);
-static void Modules_errstring (CHAR *s, LONGINT s__len);
+static void Modules_errstring (CHAR *s, ADDRESS s__len);
 
 #define Modules_modules()	(Modules_Module)Heap_modules
 #define Modules_setmodules(m)	Heap_modules = m
 
-static void Modules_Append (CHAR *a, LONGINT a__len, CHAR *b, LONGINT b__len)
+static void Modules_Append (CHAR *a, ADDRESS a__len, CHAR *b, ADDRESS b__len)
 {
 	INT16 i, j;
 	__DUP(b, b__len, CHAR);
@@ -79,7 +79,7 @@ static void Modules_Append (CHAR *a, LONGINT a__len, CHAR *b, LONGINT b__len)
 	__DEL(b);
 }
 
-Modules_Module Modules_ThisMod (CHAR *name, LONGINT name__len)
+Modules_Module Modules_ThisMod (CHAR *name, ADDRESS name__len)
 {
 	Modules_Module m = NIL;
 	CHAR bodyname[64];
@@ -103,7 +103,7 @@ Modules_Module Modules_ThisMod (CHAR *name, LONGINT name__len)
 	return m;
 }
 
-Modules_Command Modules_ThisCommand (Modules_Module mod, CHAR *name, LONGINT name__len)
+Modules_Command Modules_ThisCommand (Modules_Module mod, CHAR *name, ADDRESS name__len)
 {
 	Modules_Cmd c = NIL;
 	__DUP(name, name__len, CHAR);
@@ -130,7 +130,7 @@ Modules_Command Modules_ThisCommand (Modules_Module mod, CHAR *name, LONGINT nam
 	__RETCHK;
 }
 
-void Modules_Free (CHAR *name, LONGINT name__len, BOOLEAN all)
+void Modules_Free (CHAR *name, ADDRESS name__len, BOOLEAN all)
 {
 	Modules_Module m = NIL, p = NIL;
 	__DUP(name, name__len, CHAR);
@@ -168,7 +168,7 @@ static void Modules_errch (CHAR c)
 	e = Platform_Write(1, (ADDRESS)&c, 1);
 }
 
-static void Modules_errstring (CHAR *s, LONGINT s__len)
+static void Modules_errstring (CHAR *s, ADDRESS s__len)
 {
 	INT32 i;
 	__DUP(s, s__len, CHAR);
diff --git a/bootstrap/unix-44/Modules.h b/bootstrap/unix-44/Modules.h
index 8bb89fe5..b1f2385e 100644
--- a/bootstrap/unix-44/Modules.h
+++ b/bootstrap/unix-44/Modules.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef Modules__h
 #define Modules__h
@@ -44,10 +44,10 @@ import ADDRESS *Modules_ModuleDesc__typ;
 import ADDRESS *Modules_CmdDesc__typ;
 
 import void Modules_AssertFail (INT32 code);
-import void Modules_Free (CHAR *name, LONGINT name__len, BOOLEAN all);
+import void Modules_Free (CHAR *name, ADDRESS name__len, BOOLEAN all);
 import void Modules_Halt (INT32 code);
-import Modules_Command Modules_ThisCommand (Modules_Module mod, CHAR *name, LONGINT name__len);
-import Modules_Module Modules_ThisMod (CHAR *name, LONGINT name__len);
+import Modules_Command Modules_ThisCommand (Modules_Module mod, CHAR *name, ADDRESS name__len);
+import Modules_Module Modules_ThisMod (CHAR *name, ADDRESS name__len);
 import void *Modules__init(void);
 
 
diff --git a/bootstrap/unix-44/OPB.c b/bootstrap/unix-44/OPB.c
index 3ef8e2f9..bc44b83a 100644
--- a/bootstrap/unix-44/OPB.c
+++ b/bootstrap/unix-44/OPB.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/unix-44/OPB.h b/bootstrap/unix-44/OPB.h
index 0be714e8..eb93787e 100644
--- a/bootstrap/unix-44/OPB.h
+++ b/bootstrap/unix-44/OPB.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef OPB__h
 #define OPB__h
diff --git a/bootstrap/unix-44/OPC.c b/bootstrap/unix-44/OPC.c
index ef4b429f..72e0feef 100644
--- a/bootstrap/unix-44/OPC.c
+++ b/bootstrap/unix-44/OPC.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
@@ -56,7 +56,7 @@ static void OPC_GenHeaderMsg (void);
 export void OPC_Halt (INT32 n);
 export void OPC_Ident (OPT_Object obj);
 static void OPC_IdentList (OPT_Object obj, INT16 vis);
-static void OPC_Include (CHAR *name, LONGINT name__len);
+static void OPC_Include (CHAR *name, ADDRESS name__len);
 static void OPC_IncludeImports (OPT_Object obj, INT16 vis);
 export void OPC_Increment (BOOLEAN decrement);
 export void OPC_Indent (INT16 count);
@@ -68,11 +68,11 @@ static void OPC_InitTProcs (OPT_Object typ, OPT_Object obj);
 export void OPC_IntLiteral (INT64 n, INT32 size);
 export void OPC_Len (OPT_Object obj, OPT_Struct array, INT64 dim);
 static void OPC_LenList (OPT_Object par, BOOLEAN ansiDefine, BOOLEAN showParamName);
-static INT16 OPC_Length (CHAR *s, LONGINT s__len);
+static INT16 OPC_Length (CHAR *s, ADDRESS s__len);
 export BOOLEAN OPC_NeedsRetval (OPT_Object proc);
 export INT32 OPC_NofPtrs (OPT_Struct typ);
-static INT16 OPC_PerfectHash (CHAR *s, LONGINT s__len);
-static BOOLEAN OPC_Prefixed (OPT_ConstExt x, CHAR *y, LONGINT y__len);
+static INT16 OPC_PerfectHash (CHAR *s, ADDRESS s__len);
+static BOOLEAN OPC_Prefixed (OPT_ConstExt x, CHAR *y, ADDRESS y__len);
 static void OPC_ProcHeader (OPT_Object proc, BOOLEAN define);
 static void OPC_ProcPredefs (OPT_Object obj, INT8 vis);
 static void OPC_PutBase (OPT_Struct typ);
@@ -80,8 +80,8 @@ static void OPC_PutPtrOffsets (OPT_Struct typ, INT32 adr, INT32 *cnt);
 static void OPC_RegCmds (OPT_Object obj);
 export void OPC_SetInclude (BOOLEAN exclude);
 static void OPC_Stars (OPT_Struct typ, BOOLEAN *openClause);
-static void OPC_Str1 (CHAR *s, LONGINT s__len, INT32 x);
-static void OPC_StringLiteral (CHAR *s, LONGINT s__len, INT32 l);
+static void OPC_Str1 (CHAR *s, ADDRESS s__len, INT32 x);
+static void OPC_StringLiteral (CHAR *s, ADDRESS s__len, INT32 l);
 export void OPC_TDescDecl (OPT_Struct typ);
 export void OPC_TypeDefs (OPT_Object obj, INT16 vis);
 export void OPC_TypeOf (OPT_Object ap);
@@ -137,7 +137,7 @@ void OPC_EndBlk0 (void)
 	OPM_Write('}');
 }
 
-static void OPC_Str1 (CHAR *s, LONGINT s__len, INT32 x)
+static void OPC_Str1 (CHAR *s, ADDRESS s__len, INT32 x)
 {
 	CHAR ch;
 	INT16 i;
@@ -156,7 +156,7 @@ static void OPC_Str1 (CHAR *s, LONGINT s__len, INT32 x)
 	__DEL(s);
 }
 
-static INT16 OPC_Length (CHAR *s, LONGINT s__len)
+static INT16 OPC_Length (CHAR *s, ADDRESS s__len)
 {
 	INT16 i;
 	i = 0;
@@ -166,7 +166,7 @@ static INT16 OPC_Length (CHAR *s, LONGINT s__len)
 	return i;
 }
 
-static INT16 OPC_PerfectHash (CHAR *s, LONGINT s__len)
+static INT16 OPC_PerfectHash (CHAR *s, ADDRESS s__len)
 {
 	INT16 i, h;
 	i = 0;
@@ -364,7 +364,7 @@ static void OPC_DeclareBase (OPT_Object dcl)
 		OPM_WriteString((CHAR*)"struct ", 8);
 		OPC_BegBlk();
 		OPC_BegStat();
-		OPC_Str1((CHAR*)"LONGINT len[#]", 15, nofdims);
+		OPC_Str1((CHAR*)"ADDRESS len[#]", 15, nofdims);
 		OPC_EndStat();
 		OPC_BegStat();
 		__NEW(obj, OPT_ObjDesc);
@@ -511,7 +511,7 @@ static void OPC_LenList (OPT_Object par, BOOLEAN ansiDefine, BOOLEAN showParamNa
 	typ = par->typ->BaseTyp;
 	while (typ->comp == 3) {
 		if (ansiDefine) {
-			OPM_WriteString((CHAR*)", LONGINT ", 11);
+			OPM_WriteString((CHAR*)", ADDRESS ", 11);
 		} else {
 			OPM_WriteString((CHAR*)", ", 3);
 		}
@@ -720,7 +720,7 @@ static void OPC_DefineType (OPT_Struct str)
 	}
 }
 
-static BOOLEAN OPC_Prefixed (OPT_ConstExt x, CHAR *y, LONGINT y__len)
+static BOOLEAN OPC_Prefixed (OPT_ConstExt x, CHAR *y, ADDRESS y__len)
 {
 	INT16 i;
 	__DUP(y, y__len, CHAR);
@@ -969,7 +969,7 @@ static void OPC_IdentList (OPT_Object obj, INT16 vis)
 				OPC_EndStat();
 				OPC_BegStat();
 				base = OPT_linttyp;
-				OPM_WriteString((CHAR*)"LONGINT ", 9);
+				OPM_WriteString((CHAR*)"ADDRESS ", 9);
 				OPC_LenList(obj, 0, 1);
 			} else if ((obj->mode == 2 && obj->typ->comp == 4)) {
 				OPC_EndStat();
@@ -1008,7 +1008,7 @@ static void OPC_AnsiParamList (OPT_Object obj, BOOLEAN showParamNames)
 				__COPY(name, obj->name, 256);
 			}
 			if (obj->typ->comp == 3) {
-				OPM_WriteString((CHAR*)", LONGINT ", 11);
+				OPM_WriteString((CHAR*)", ADDRESS ", 11);
 				OPC_LenList(obj, 1, showParamNames);
 			} else if ((obj->mode == 2 && obj->typ->comp == 4)) {
 				OPM_WriteString((CHAR*)", ADDRESS *", 12);
@@ -1062,7 +1062,7 @@ static void OPC_ProcPredefs (OPT_Object obj, INT8 vis)
 	}
 }
 
-static void OPC_Include (CHAR *name, LONGINT name__len)
+static void OPC_Include (CHAR *name, ADDRESS name__len)
 {
 	__DUP(name, name__len, CHAR);
 	OPM_WriteString((CHAR*)"#include ", 10);
@@ -1744,7 +1744,7 @@ static void OPC_CharacterLiteral (INT64 c)
 	}
 }
 
-static void OPC_StringLiteral (CHAR *s, LONGINT s__len, INT32 l)
+static void OPC_StringLiteral (CHAR *s, ADDRESS s__len, INT32 l)
 {
 	INT32 i;
 	INT16 c;
@@ -1912,9 +1912,9 @@ static struct InitKeywords__46 {
 	struct InitKeywords__46 *lnk;
 } *InitKeywords__46_s;
 
-static void Enter__47 (CHAR *s, LONGINT s__len);
+static void Enter__47 (CHAR *s, ADDRESS s__len);
 
-static void Enter__47 (CHAR *s, LONGINT s__len)
+static void Enter__47 (CHAR *s, ADDRESS s__len)
 {
 	INT16 h;
 	__DUP(s, s__len, CHAR);
diff --git a/bootstrap/unix-44/OPC.h b/bootstrap/unix-44/OPC.h
index 842e7dec..5624314d 100644
--- a/bootstrap/unix-44/OPC.h
+++ b/bootstrap/unix-44/OPC.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef OPC__h
 #define OPC__h
diff --git a/bootstrap/unix-44/OPM.c b/bootstrap/unix-44/OPM.c
index e76d763e..632b78e5 100644
--- a/bootstrap/unix-44/OPM.c
+++ b/bootstrap/unix-44/OPM.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
@@ -53,26 +53,26 @@ export void OPM_FPrintLReal (INT32 *fp, LONGREAL val);
 export void OPM_FPrintReal (INT32 *fp, REAL val);
 export void OPM_FPrintSet (INT32 *fp, UINT64 val);
 static void OPM_FindLine (Files_File f, Files_Rider *r, ADDRESS *r__typ, INT64 pos);
-static void OPM_FingerprintBytes (INT32 *fp, SYSTEM_BYTE *bytes, LONGINT bytes__len);
+static void OPM_FingerprintBytes (INT32 *fp, SYSTEM_BYTE *bytes, ADDRESS bytes__len);
 export void OPM_Get (CHAR *ch);
-export void OPM_Init (BOOLEAN *done, CHAR *mname, LONGINT mname__len);
+export void OPM_Init (BOOLEAN *done, CHAR *mname, ADDRESS mname__len);
 export void OPM_InitOptions (void);
 export INT16 OPM_Integer (INT64 n);
 static void OPM_LogErrMsg (INT16 n);
-export void OPM_LogVT100 (CHAR *vt100code, LONGINT vt100code__len);
+export void OPM_LogVT100 (CHAR *vt100code, ADDRESS vt100code__len);
 export void OPM_LogW (CHAR ch);
 export void OPM_LogWLn (void);
 export void OPM_LogWNum (INT64 i, INT64 len);
-export void OPM_LogWStr (CHAR *s, LONGINT s__len);
+export void OPM_LogWStr (CHAR *s, ADDRESS s__len);
 export INT32 OPM_Longint (INT64 n);
-static void OPM_MakeFileName (CHAR *name, LONGINT name__len, CHAR *FName, LONGINT FName__len, CHAR *ext, LONGINT ext__len);
+static void OPM_MakeFileName (CHAR *name, ADDRESS name__len, CHAR *FName, ADDRESS FName__len, CHAR *ext, ADDRESS ext__len);
 export void OPM_Mark (INT16 n, INT32 pos);
-export void OPM_NewSym (CHAR *modName, LONGINT modName__len);
-export void OPM_OldSym (CHAR *modName, LONGINT modName__len, BOOLEAN *done);
-export void OPM_OpenFiles (CHAR *moduleName, LONGINT moduleName__len);
+export void OPM_NewSym (CHAR *modName, ADDRESS modName__len);
+export void OPM_OldSym (CHAR *modName, ADDRESS modName__len, BOOLEAN *done);
+export void OPM_OpenFiles (CHAR *moduleName, ADDRESS moduleName__len);
 export BOOLEAN OPM_OpenPar (void);
 export void OPM_RegisterNewSym (void);
-static void OPM_ScanOptions (CHAR *s, LONGINT s__len);
+static void OPM_ScanOptions (CHAR *s, ADDRESS s__len);
 static void OPM_ShowLine (INT64 pos);
 export INT64 OPM_SignedMaximum (INT32 bytecount);
 export INT64 OPM_SignedMinimum (INT32 bytecount);
@@ -93,8 +93,8 @@ export void OPM_WriteHex (INT64 i);
 export void OPM_WriteInt (INT64 i);
 export void OPM_WriteLn (void);
 export void OPM_WriteReal (LONGREAL r, CHAR suffx);
-export void OPM_WriteString (CHAR *s, LONGINT s__len);
-export void OPM_WriteStringVar (CHAR *s, LONGINT s__len);
+export void OPM_WriteString (CHAR *s, ADDRESS s__len);
+export void OPM_WriteStringVar (CHAR *s, ADDRESS s__len);
 export BOOLEAN OPM_eofSF (void);
 export void OPM_err (INT16 n);
 
@@ -105,7 +105,7 @@ void OPM_LogW (CHAR ch)
 	Out_Char(ch);
 }
 
-void OPM_LogWStr (CHAR *s, LONGINT s__len)
+void OPM_LogWStr (CHAR *s, ADDRESS s__len)
 {
 	__DUP(s, s__len, CHAR);
 	Out_String(s, s__len);
@@ -122,7 +122,7 @@ void OPM_LogWLn (void)
 	Out_Ln();
 }
 
-void OPM_LogVT100 (CHAR *vt100code, LONGINT vt100code__len)
+void OPM_LogVT100 (CHAR *vt100code, ADDRESS vt100code__len)
 {
 	__DUP(vt100code, vt100code__len, CHAR);
 	if ((Out_IsConsole && !__IN(16, OPM_Options, 32))) {
@@ -154,7 +154,7 @@ INT16 OPM_Integer (INT64 n)
 	return __VAL(INT16, n);
 }
 
-static void OPM_ScanOptions (CHAR *s, LONGINT s__len)
+static void OPM_ScanOptions (CHAR *s, ADDRESS s__len)
 {
 	INT16 i;
 	__DUP(s, s__len, CHAR);
@@ -465,7 +465,7 @@ void OPM_InitOptions (void)
 	Files_SetSearchPath(searchpath, 1024);
 }
 
-void OPM_Init (BOOLEAN *done, CHAR *mname, LONGINT mname__len)
+void OPM_Init (BOOLEAN *done, CHAR *mname, ADDRESS mname__len)
 {
 	Texts_Text T = NIL;
 	INT32 beg, end, time;
@@ -514,7 +514,7 @@ void OPM_Get (CHAR *ch)
 	}
 }
 
-static void OPM_MakeFileName (CHAR *name, LONGINT name__len, CHAR *FName, LONGINT FName__len, CHAR *ext, LONGINT ext__len)
+static void OPM_MakeFileName (CHAR *name, ADDRESS name__len, CHAR *FName, ADDRESS FName__len, CHAR *ext, ADDRESS ext__len)
 {
 	INT16 i, j;
 	CHAR ch;
@@ -700,7 +700,7 @@ void OPM_err (INT16 n)
 	OPM_Mark(n, OPM_errpos);
 }
 
-static void OPM_FingerprintBytes (INT32 *fp, SYSTEM_BYTE *bytes, LONGINT bytes__len)
+static void OPM_FingerprintBytes (INT32 *fp, SYSTEM_BYTE *bytes, ADDRESS bytes__len)
 {
 	INT16 i;
 	INT32 l;
@@ -772,7 +772,7 @@ void OPM_CloseOldSym (void)
 	Files_Close(Files_Base(&OPM_oldSF, Files_Rider__typ));
 }
 
-void OPM_OldSym (CHAR *modName, LONGINT modName__len, BOOLEAN *done)
+void OPM_OldSym (CHAR *modName, ADDRESS modName__len, BOOLEAN *done)
 {
 	CHAR tag, ver;
 	OPM_FileName fileName;
@@ -832,7 +832,7 @@ void OPM_DeleteNewSym (void)
 {
 }
 
-void OPM_NewSym (CHAR *modName, LONGINT modName__len)
+void OPM_NewSym (CHAR *modName, ADDRESS modName__len)
 {
 	OPM_FileName fileName;
 	OPM_MakeFileName((void*)modName, modName__len, (void*)fileName, 32, (CHAR*)".sym", 5);
@@ -851,7 +851,7 @@ void OPM_Write (CHAR ch)
 	Files_Write(&OPM_R[__X(OPM_currFile, 3)], Files_Rider__typ, ch);
 }
 
-void OPM_WriteString (CHAR *s, LONGINT s__len)
+void OPM_WriteString (CHAR *s, ADDRESS s__len)
 {
 	INT16 i;
 	i = 0;
@@ -861,7 +861,7 @@ void OPM_WriteString (CHAR *s, LONGINT s__len)
 	Files_WriteBytes(&OPM_R[__X(OPM_currFile, 3)], Files_Rider__typ, (void*)s, s__len * 1, i);
 }
 
-void OPM_WriteStringVar (CHAR *s, LONGINT s__len)
+void OPM_WriteStringVar (CHAR *s, ADDRESS s__len)
 {
 	INT16 i;
 	i = 0;
@@ -986,7 +986,7 @@ static void OPM_Append (Files_Rider *R, ADDRESS *R__typ, Files_File F)
 	}
 }
 
-void OPM_OpenFiles (CHAR *moduleName, LONGINT moduleName__len)
+void OPM_OpenFiles (CHAR *moduleName, ADDRESS moduleName__len)
 {
 	CHAR FName[32];
 	__COPY(moduleName, OPM_modName, 32);
diff --git a/bootstrap/unix-44/OPM.h b/bootstrap/unix-44/OPM.h
index 2d272feb..c310c421 100644
--- a/bootstrap/unix-44/OPM.h
+++ b/bootstrap/unix-44/OPM.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef OPM__h
 #define OPM__h
@@ -28,19 +28,19 @@ import void OPM_FPrintLReal (INT32 *fp, LONGREAL val);
 import void OPM_FPrintReal (INT32 *fp, REAL val);
 import void OPM_FPrintSet (INT32 *fp, UINT64 val);
 import void OPM_Get (CHAR *ch);
-import void OPM_Init (BOOLEAN *done, CHAR *mname, LONGINT mname__len);
+import void OPM_Init (BOOLEAN *done, CHAR *mname, ADDRESS mname__len);
 import void OPM_InitOptions (void);
 import INT16 OPM_Integer (INT64 n);
-import void OPM_LogVT100 (CHAR *vt100code, LONGINT vt100code__len);
+import void OPM_LogVT100 (CHAR *vt100code, ADDRESS vt100code__len);
 import void OPM_LogW (CHAR ch);
 import void OPM_LogWLn (void);
 import void OPM_LogWNum (INT64 i, INT64 len);
-import void OPM_LogWStr (CHAR *s, LONGINT s__len);
+import void OPM_LogWStr (CHAR *s, ADDRESS s__len);
 import INT32 OPM_Longint (INT64 n);
 import void OPM_Mark (INT16 n, INT32 pos);
-import void OPM_NewSym (CHAR *modName, LONGINT modName__len);
-import void OPM_OldSym (CHAR *modName, LONGINT modName__len, BOOLEAN *done);
-import void OPM_OpenFiles (CHAR *moduleName, LONGINT moduleName__len);
+import void OPM_NewSym (CHAR *modName, ADDRESS modName__len);
+import void OPM_OldSym (CHAR *modName, ADDRESS modName__len, BOOLEAN *done);
+import void OPM_OpenFiles (CHAR *moduleName, ADDRESS moduleName__len);
 import BOOLEAN OPM_OpenPar (void);
 import void OPM_RegisterNewSym (void);
 import INT64 OPM_SignedMaximum (INT32 bytecount);
@@ -61,8 +61,8 @@ import void OPM_WriteHex (INT64 i);
 import void OPM_WriteInt (INT64 i);
 import void OPM_WriteLn (void);
 import void OPM_WriteReal (LONGREAL r, CHAR suffx);
-import void OPM_WriteString (CHAR *s, LONGINT s__len);
-import void OPM_WriteStringVar (CHAR *s, LONGINT s__len);
+import void OPM_WriteString (CHAR *s, ADDRESS s__len);
+import void OPM_WriteStringVar (CHAR *s, ADDRESS s__len);
 import BOOLEAN OPM_eofSF (void);
 import void OPM_err (INT16 n);
 import void *OPM__init(void);
diff --git a/bootstrap/unix-44/OPP.c b/bootstrap/unix-44/OPP.c
index 3f360d00..02fd6337 100644
--- a/bootstrap/unix-44/OPP.c
+++ b/bootstrap/unix-44/OPP.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/unix-44/OPP.h b/bootstrap/unix-44/OPP.h
index 5a71eb39..acb2df91 100644
--- a/bootstrap/unix-44/OPP.h
+++ b/bootstrap/unix-44/OPP.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef OPP__h
 #define OPP__h
diff --git a/bootstrap/unix-44/OPS.c b/bootstrap/unix-44/OPS.c
index 6ee700e5..7aedbbd6 100644
--- a/bootstrap/unix-44/OPS.c
+++ b/bootstrap/unix-44/OPS.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. tspaSF */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. tspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/unix-44/OPS.h b/bootstrap/unix-44/OPS.h
index 1f7a3e58..e49c222b 100644
--- a/bootstrap/unix-44/OPS.h
+++ b/bootstrap/unix-44/OPS.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. tspaSF */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. tspaSF */
 
 #ifndef OPS__h
 #define OPS__h
diff --git a/bootstrap/unix-44/OPT.c b/bootstrap/unix-44/OPT.c
index fb007184..58f06737 100644
--- a/bootstrap/unix-44/OPT.c
+++ b/bootstrap/unix-44/OPT.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
@@ -120,7 +120,7 @@ static void OPT_EnterTyp (OPS_Name name, INT8 form, INT16 size, OPT_Struct *res)
 static void OPT_EnterTypeAlias (OPS_Name name, OPT_Object *res);
 export void OPT_Export (BOOLEAN *ext, BOOLEAN *new);
 export void OPT_FPrintErr (OPT_Object obj, INT16 errcode);
-static void OPT_FPrintName (INT32 *fp, CHAR *name, LONGINT name__len);
+static void OPT_FPrintName (INT32 *fp, CHAR *name, ADDRESS name__len);
 export void OPT_FPrintObj (OPT_Object obj);
 static void OPT_FPrintSign (INT32 *fp, OPT_Struct result, OPT_Object par);
 export void OPT_FPrintStr (OPT_Struct typ);
@@ -132,7 +132,7 @@ export void OPT_Import (OPS_Name aliasName, OPS_Name name, BOOLEAN *done);
 static void OPT_InConstant (INT32 f, OPT_Const conval);
 static OPT_Object OPT_InFld (void);
 static void OPT_InMod (INT8 *mno);
-static void OPT_InName (CHAR *name, LONGINT name__len);
+static void OPT_InName (CHAR *name, ADDRESS name__len);
 static OPT_Object OPT_InObj (INT8 mno);
 static void OPT_InSign (INT8 mno, OPT_Struct *res, OPT_Object *par);
 static void OPT_InStruct (OPT_Struct *typ);
@@ -155,7 +155,7 @@ static void OPT_OutConstant (OPT_Object obj);
 static void OPT_OutFlds (OPT_Object fld, INT32 adr, BOOLEAN visible);
 static void OPT_OutHdFld (OPT_Struct typ, OPT_Object fld, INT32 adr);
 static void OPT_OutMod (INT16 mno);
-static void OPT_OutName (CHAR *name, LONGINT name__len);
+static void OPT_OutName (CHAR *name, ADDRESS name__len);
 static void OPT_OutObj (OPT_Object obj);
 static void OPT_OutSign (OPT_Struct result, OPT_Object par);
 static void OPT_OutStr (OPT_Struct typ);
@@ -576,7 +576,7 @@ void OPT_Insert (OPS_Name name, OPT_Object *obj)
 	*obj = ob1;
 }
 
-static void OPT_FPrintName (INT32 *fp, CHAR *name, LONGINT name__len)
+static void OPT_FPrintName (INT32 *fp, CHAR *name, ADDRESS name__len)
 {
 	INT16 i;
 	CHAR ch;
@@ -957,7 +957,7 @@ void OPT_InsertImport (OPT_Object obj, OPT_Object *root, OPT_Object *old)
 	}
 }
 
-static void OPT_InName (CHAR *name, LONGINT name__len)
+static void OPT_InName (CHAR *name, ADDRESS name__len)
 {
 	INT16 i;
 	CHAR ch;
@@ -1483,7 +1483,7 @@ void OPT_Import (OPS_Name aliasName, OPS_Name name, BOOLEAN *done)
 	}
 }
 
-static void OPT_OutName (CHAR *name, LONGINT name__len)
+static void OPT_OutName (CHAR *name, ADDRESS name__len)
 {
 	INT16 i;
 	CHAR ch;
diff --git a/bootstrap/unix-44/OPT.h b/bootstrap/unix-44/OPT.h
index 90fcacf5..9d34cea9 100644
--- a/bootstrap/unix-44/OPT.h
+++ b/bootstrap/unix-44/OPT.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef OPT__h
 #define OPT__h
diff --git a/bootstrap/unix-44/OPV.c b/bootstrap/unix-44/OPV.c
index 5c21cb97..f6d42592 100644
--- a/bootstrap/unix-44/OPV.c
+++ b/bootstrap/unix-44/OPV.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/unix-44/OPV.h b/bootstrap/unix-44/OPV.h
index c4a61586..0f1980ac 100644
--- a/bootstrap/unix-44/OPV.h
+++ b/bootstrap/unix-44/OPV.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef OPV__h
 #define OPV__h
diff --git a/bootstrap/unix-44/Out.c b/bootstrap/unix-44/Out.c
index 39f383cf..82ad945b 100644
--- a/bootstrap/unix-44/Out.c
+++ b/bootstrap/unix-44/Out.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
@@ -17,16 +17,16 @@ static INT16 Out_in;
 export void Out_Char (CHAR ch);
 export void Out_Flush (void);
 export void Out_Int (INT64 x, INT64 n);
-static INT32 Out_Length (CHAR *s, LONGINT s__len);
+static INT32 Out_Length (CHAR *s, ADDRESS s__len);
 export void Out_Ln (void);
 export void Out_LongReal (LONGREAL x, INT16 n);
 export void Out_Open (void);
 export void Out_Real (REAL x, INT16 n);
 static void Out_RealP (LONGREAL x, INT16 n, BOOLEAN long_);
-export void Out_String (CHAR *str, LONGINT str__len);
+export void Out_String (CHAR *str, ADDRESS str__len);
 export LONGREAL Out_Ten (INT16 e);
-static void Out_digit (INT64 n, CHAR *s, LONGINT s__len, INT16 *i);
-static void Out_prepend (CHAR *t, LONGINT t__len, CHAR *s, LONGINT s__len, INT16 *i);
+static void Out_digit (INT64 n, CHAR *s, ADDRESS s__len, INT16 *i);
+static void Out_prepend (CHAR *t, ADDRESS t__len, CHAR *s, ADDRESS s__len, INT16 *i);
 
 #define Out_Entier64(x)	(INT64)(x)
 
@@ -55,7 +55,7 @@ void Out_Char (CHAR ch)
 	}
 }
 
-static INT32 Out_Length (CHAR *s, LONGINT s__len)
+static INT32 Out_Length (CHAR *s, ADDRESS s__len)
 {
 	INT32 l;
 	l = 0;
@@ -65,7 +65,7 @@ static INT32 Out_Length (CHAR *s, LONGINT s__len)
 	return l;
 }
 
-void Out_String (CHAR *str, LONGINT str__len)
+void Out_String (CHAR *str, ADDRESS str__len)
 {
 	INT32 l;
 	INT16 error;
@@ -125,13 +125,13 @@ void Out_Ln (void)
 	Out_Flush();
 }
 
-static void Out_digit (INT64 n, CHAR *s, LONGINT s__len, INT16 *i)
+static void Out_digit (INT64 n, CHAR *s, ADDRESS s__len, INT16 *i)
 {
 	*i -= 1;
 	s[__X(*i, s__len)] = (CHAR)(__MOD(n, 10) + 48);
 }
 
-static void Out_prepend (CHAR *t, LONGINT t__len, CHAR *s, LONGINT s__len, INT16 *i)
+static void Out_prepend (CHAR *t, ADDRESS t__len, CHAR *s, ADDRESS s__len, INT16 *i)
 {
 	INT16 j;
 	INT32 l;
diff --git a/bootstrap/unix-44/Out.h b/bootstrap/unix-44/Out.h
index 0e66420d..d58a17d5 100644
--- a/bootstrap/unix-44/Out.h
+++ b/bootstrap/unix-44/Out.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef Out__h
 #define Out__h
@@ -16,7 +16,7 @@ import void Out_Ln (void);
 import void Out_LongReal (LONGREAL x, INT16 n);
 import void Out_Open (void);
 import void Out_Real (REAL x, INT16 n);
-import void Out_String (CHAR *str, LONGINT str__len);
+import void Out_String (CHAR *str, ADDRESS str__len);
 import LONGREAL Out_Ten (INT16 e);
 import void *Out__init(void);
 
diff --git a/bootstrap/unix-44/Platform.c b/bootstrap/unix-44/Platform.c
index 72c15bf8..459d5079 100644
--- a/bootstrap/unix-44/Platform.c
+++ b/bootstrap/unix-44/Platform.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
@@ -45,35 +45,35 @@ export CHAR Platform_NL[3];
 export ADDRESS *Platform_FileIdentity__typ;
 
 export BOOLEAN Platform_Absent (INT16 e);
-export INT16 Platform_ArgPos (CHAR *s, LONGINT s__len);
-export INT16 Platform_Chdir (CHAR *n, LONGINT n__len);
+export INT16 Platform_ArgPos (CHAR *s, ADDRESS s__len);
+export INT16 Platform_Chdir (CHAR *n, ADDRESS n__len);
 export INT16 Platform_Close (INT32 h);
 export BOOLEAN Platform_ConnectionFailed (INT16 e);
 export void Platform_Delay (INT32 ms);
 export BOOLEAN Platform_DifferentFilesystems (INT16 e);
 export INT16 Platform_Error (void);
 export void Platform_Exit (INT32 code);
-export void Platform_GetArg (INT16 n, CHAR *val, LONGINT val__len);
+export void Platform_GetArg (INT16 n, CHAR *val, ADDRESS val__len);
 export void Platform_GetClock (INT32 *t, INT32 *d);
-export void Platform_GetEnv (CHAR *var, LONGINT var__len, CHAR *val, LONGINT val__len);
+export void Platform_GetEnv (CHAR *var, ADDRESS var__len, CHAR *val, ADDRESS val__len);
 export void Platform_GetIntArg (INT16 n, INT32 *val);
 export void Platform_GetTimeOfDay (INT32 *sec, INT32 *usec);
 export INT16 Platform_Identify (INT32 h, Platform_FileIdentity *identity, ADDRESS *identity__typ);
-export INT16 Platform_IdentifyByName (CHAR *n, LONGINT n__len, Platform_FileIdentity *identity, ADDRESS *identity__typ);
+export INT16 Platform_IdentifyByName (CHAR *n, ADDRESS n__len, Platform_FileIdentity *identity, ADDRESS *identity__typ);
 export BOOLEAN Platform_Inaccessible (INT16 e);
 export void Platform_Init (INT32 argc, INT32 argvadr);
 export BOOLEAN Platform_Interrupted (INT16 e);
 export BOOLEAN Platform_IsConsole (INT32 h);
 export void Platform_MTimeAsClock (Platform_FileIdentity i, INT32 *t, INT32 *d);
-export INT16 Platform_New (CHAR *n, LONGINT n__len, INT32 *h);
+export INT16 Platform_New (CHAR *n, ADDRESS n__len, INT32 *h);
 export BOOLEAN Platform_NoSuchDirectory (INT16 e);
 export INT32 Platform_OSAllocate (INT32 size);
 export void Platform_OSFree (INT32 address);
-export INT16 Platform_OldRO (CHAR *n, LONGINT n__len, INT32 *h);
-export INT16 Platform_OldRW (CHAR *n, LONGINT n__len, INT32 *h);
+export INT16 Platform_OldRO (CHAR *n, ADDRESS n__len, INT32 *h);
+export INT16 Platform_OldRW (CHAR *n, ADDRESS n__len, INT32 *h);
 export INT16 Platform_Read (INT32 h, INT32 p, INT32 l, INT32 *n);
-export INT16 Platform_ReadBuf (INT32 h, SYSTEM_BYTE *b, LONGINT b__len, INT32 *n);
-export INT16 Platform_Rename (CHAR *o, LONGINT o__len, CHAR *n, LONGINT n__len);
+export INT16 Platform_ReadBuf (INT32 h, SYSTEM_BYTE *b, ADDRESS b__len, INT32 *n);
+export INT16 Platform_Rename (CHAR *o, ADDRESS o__len, CHAR *n, ADDRESS n__len);
 export BOOLEAN Platform_SameFile (Platform_FileIdentity i1, Platform_FileIdentity i2);
 export BOOLEAN Platform_SameFileTime (Platform_FileIdentity i1, Platform_FileIdentity i2);
 export INT16 Platform_Seek (INT32 h, INT32 offset, INT16 whence);
@@ -83,16 +83,16 @@ export void Platform_SetMTime (Platform_FileIdentity *target, ADDRESS *target__t
 export void Platform_SetQuitHandler (Platform_SignalHandler handler);
 export INT16 Platform_Size (INT32 h, INT32 *l);
 export INT16 Platform_Sync (INT32 h);
-export INT16 Platform_System (CHAR *cmd, LONGINT cmd__len);
+export INT16 Platform_System (CHAR *cmd, ADDRESS cmd__len);
 static void Platform_TestLittleEndian (void);
 export INT32 Platform_Time (void);
 export BOOLEAN Platform_TimedOut (INT16 e);
 export BOOLEAN Platform_TooManyFiles (INT16 e);
 export INT16 Platform_Truncate (INT32 h, INT32 l);
-export INT16 Platform_Unlink (CHAR *n, LONGINT n__len);
+export INT16 Platform_Unlink (CHAR *n, ADDRESS n__len);
 export INT16 Platform_Write (INT32 h, INT32 p, INT32 l);
 static void Platform_YMDHMStoClock (INT32 ye, INT32 mo, INT32 da, INT32 ho, INT32 mi, INT32 se, INT32 *t, INT32 *d);
-export BOOLEAN Platform_getEnv (CHAR *var, LONGINT var__len, CHAR *val, LONGINT val__len);
+export BOOLEAN Platform_getEnv (CHAR *var, ADDRESS var__len, CHAR *val, ADDRESS val__len);
 
 #include <errno.h>
 #include <errno.h>
@@ -223,7 +223,7 @@ void Platform_Init (INT32 argc, INT32 argvadr)
 	Platform_HeapInitHeap();
 }
 
-BOOLEAN Platform_getEnv (CHAR *var, LONGINT var__len, CHAR *val, LONGINT val__len)
+BOOLEAN Platform_getEnv (CHAR *var, ADDRESS var__len, CHAR *val, ADDRESS val__len)
 {
 	Platform_EnvPtr p = NIL;
 	__DUP(var, var__len, CHAR);
@@ -235,7 +235,7 @@ BOOLEAN Platform_getEnv (CHAR *var, LONGINT var__len, CHAR *val, LONGINT val__le
 	return p != NIL;
 }
 
-void Platform_GetEnv (CHAR *var, LONGINT var__len, CHAR *val, LONGINT val__len)
+void Platform_GetEnv (CHAR *var, ADDRESS var__len, CHAR *val, ADDRESS val__len)
 {
 	__DUP(var, var__len, CHAR);
 	if (!Platform_getEnv(var, var__len, (void*)val, val__len)) {
@@ -244,7 +244,7 @@ void Platform_GetEnv (CHAR *var, LONGINT var__len, CHAR *val, LONGINT val__len)
 	__DEL(var);
 }
 
-void Platform_GetArg (INT16 n, CHAR *val, LONGINT val__len)
+void Platform_GetArg (INT16 n, CHAR *val, ADDRESS val__len)
 {
 	Platform_ArgVec av = NIL;
 	if (n < Platform_ArgCount) {
@@ -279,7 +279,7 @@ void Platform_GetIntArg (INT16 n, INT32 *val)
 	}
 }
 
-INT16 Platform_ArgPos (CHAR *s, LONGINT s__len)
+INT16 Platform_ArgPos (CHAR *s, ADDRESS s__len)
 {
 	INT16 i;
 	CHAR arg[256];
@@ -345,7 +345,7 @@ void Platform_Delay (INT32 ms)
 	Platform_nanosleep(s, ns);
 }
 
-INT16 Platform_System (CHAR *cmd, LONGINT cmd__len)
+INT16 Platform_System (CHAR *cmd, ADDRESS cmd__len)
 {
 	__DUP(cmd, cmd__len, CHAR);
 	__DEL(cmd);
@@ -357,7 +357,7 @@ INT16 Platform_Error (void)
 	return Platform_err();
 }
 
-INT16 Platform_OldRO (CHAR *n, LONGINT n__len, INT32 *h)
+INT16 Platform_OldRO (CHAR *n, ADDRESS n__len, INT32 *h)
 {
 	INT16 fd;
 	fd = Platform_openro(n, n__len);
@@ -370,7 +370,7 @@ INT16 Platform_OldRO (CHAR *n, LONGINT n__len, INT32 *h)
 	__RETCHK;
 }
 
-INT16 Platform_OldRW (CHAR *n, LONGINT n__len, INT32 *h)
+INT16 Platform_OldRW (CHAR *n, ADDRESS n__len, INT32 *h)
 {
 	INT16 fd;
 	fd = Platform_openrw(n, n__len);
@@ -383,7 +383,7 @@ INT16 Platform_OldRW (CHAR *n, LONGINT n__len, INT32 *h)
 	__RETCHK;
 }
 
-INT16 Platform_New (CHAR *n, LONGINT n__len, INT32 *h)
+INT16 Platform_New (CHAR *n, ADDRESS n__len, INT32 *h)
 {
 	INT16 fd;
 	fd = Platform_opennew(n, n__len);
@@ -423,7 +423,7 @@ INT16 Platform_Identify (INT32 h, Platform_FileIdentity *identity, ADDRESS *iden
 	return 0;
 }
 
-INT16 Platform_IdentifyByName (CHAR *n, LONGINT n__len, Platform_FileIdentity *identity, ADDRESS *identity__typ)
+INT16 Platform_IdentifyByName (CHAR *n, ADDRESS n__len, Platform_FileIdentity *identity, ADDRESS *identity__typ)
 {
 	__DUP(n, n__len, CHAR);
 	Platform_structstats();
@@ -481,7 +481,7 @@ INT16 Platform_Read (INT32 h, INT32 p, INT32 l, INT32 *n)
 	__RETCHK;
 }
 
-INT16 Platform_ReadBuf (INT32 h, SYSTEM_BYTE *b, LONGINT b__len, INT32 *n)
+INT16 Platform_ReadBuf (INT32 h, SYSTEM_BYTE *b, ADDRESS b__len, INT32 *n)
 {
 	*n = Platform_readfile(h, (ADDRESS)b, b__len);
 	if (*n < 0) {
@@ -535,7 +535,7 @@ INT16 Platform_Truncate (INT32 h, INT32 l)
 	__RETCHK;
 }
 
-INT16 Platform_Unlink (CHAR *n, LONGINT n__len)
+INT16 Platform_Unlink (CHAR *n, ADDRESS n__len)
 {
 	if (Platform_unlink(n, n__len) < 0) {
 		return Platform_err();
@@ -545,7 +545,7 @@ INT16 Platform_Unlink (CHAR *n, LONGINT n__len)
 	__RETCHK;
 }
 
-INT16 Platform_Chdir (CHAR *n, LONGINT n__len)
+INT16 Platform_Chdir (CHAR *n, ADDRESS n__len)
 {
 	INT16 r;
 	if ((Platform_chdir(n, n__len) >= 0 && Platform_getcwd((void*)Platform_CWD, 256) != NIL)) {
@@ -556,7 +556,7 @@ INT16 Platform_Chdir (CHAR *n, LONGINT n__len)
 	__RETCHK;
 }
 
-INT16 Platform_Rename (CHAR *o, LONGINT o__len, CHAR *n, LONGINT n__len)
+INT16 Platform_Rename (CHAR *o, ADDRESS o__len, CHAR *n, ADDRESS n__len)
 {
 	if (Platform_rename(o, o__len, n, n__len) < 0) {
 		return Platform_err();
diff --git a/bootstrap/unix-44/Platform.h b/bootstrap/unix-44/Platform.h
index b04f552d..34547692 100644
--- a/bootstrap/unix-44/Platform.h
+++ b/bootstrap/unix-44/Platform.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef Platform__h
 #define Platform__h
@@ -27,35 +27,35 @@ import CHAR Platform_NL[3];
 import ADDRESS *Platform_FileIdentity__typ;
 
 import BOOLEAN Platform_Absent (INT16 e);
-import INT16 Platform_ArgPos (CHAR *s, LONGINT s__len);
-import INT16 Platform_Chdir (CHAR *n, LONGINT n__len);
+import INT16 Platform_ArgPos (CHAR *s, ADDRESS s__len);
+import INT16 Platform_Chdir (CHAR *n, ADDRESS n__len);
 import INT16 Platform_Close (INT32 h);
 import BOOLEAN Platform_ConnectionFailed (INT16 e);
 import void Platform_Delay (INT32 ms);
 import BOOLEAN Platform_DifferentFilesystems (INT16 e);
 import INT16 Platform_Error (void);
 import void Platform_Exit (INT32 code);
-import void Platform_GetArg (INT16 n, CHAR *val, LONGINT val__len);
+import void Platform_GetArg (INT16 n, CHAR *val, ADDRESS val__len);
 import void Platform_GetClock (INT32 *t, INT32 *d);
-import void Platform_GetEnv (CHAR *var, LONGINT var__len, CHAR *val, LONGINT val__len);
+import void Platform_GetEnv (CHAR *var, ADDRESS var__len, CHAR *val, ADDRESS val__len);
 import void Platform_GetIntArg (INT16 n, INT32 *val);
 import void Platform_GetTimeOfDay (INT32 *sec, INT32 *usec);
 import INT16 Platform_Identify (INT32 h, Platform_FileIdentity *identity, ADDRESS *identity__typ);
-import INT16 Platform_IdentifyByName (CHAR *n, LONGINT n__len, Platform_FileIdentity *identity, ADDRESS *identity__typ);
+import INT16 Platform_IdentifyByName (CHAR *n, ADDRESS n__len, Platform_FileIdentity *identity, ADDRESS *identity__typ);
 import BOOLEAN Platform_Inaccessible (INT16 e);
 import void Platform_Init (INT32 argc, INT32 argvadr);
 import BOOLEAN Platform_Interrupted (INT16 e);
 import BOOLEAN Platform_IsConsole (INT32 h);
 import void Platform_MTimeAsClock (Platform_FileIdentity i, INT32 *t, INT32 *d);
-import INT16 Platform_New (CHAR *n, LONGINT n__len, INT32 *h);
+import INT16 Platform_New (CHAR *n, ADDRESS n__len, INT32 *h);
 import BOOLEAN Platform_NoSuchDirectory (INT16 e);
 import INT32 Platform_OSAllocate (INT32 size);
 import void Platform_OSFree (INT32 address);
-import INT16 Platform_OldRO (CHAR *n, LONGINT n__len, INT32 *h);
-import INT16 Platform_OldRW (CHAR *n, LONGINT n__len, INT32 *h);
+import INT16 Platform_OldRO (CHAR *n, ADDRESS n__len, INT32 *h);
+import INT16 Platform_OldRW (CHAR *n, ADDRESS n__len, INT32 *h);
 import INT16 Platform_Read (INT32 h, INT32 p, INT32 l, INT32 *n);
-import INT16 Platform_ReadBuf (INT32 h, SYSTEM_BYTE *b, LONGINT b__len, INT32 *n);
-import INT16 Platform_Rename (CHAR *o, LONGINT o__len, CHAR *n, LONGINT n__len);
+import INT16 Platform_ReadBuf (INT32 h, SYSTEM_BYTE *b, ADDRESS b__len, INT32 *n);
+import INT16 Platform_Rename (CHAR *o, ADDRESS o__len, CHAR *n, ADDRESS n__len);
 import BOOLEAN Platform_SameFile (Platform_FileIdentity i1, Platform_FileIdentity i2);
 import BOOLEAN Platform_SameFileTime (Platform_FileIdentity i1, Platform_FileIdentity i2);
 import INT16 Platform_Seek (INT32 h, INT32 offset, INT16 whence);
@@ -65,14 +65,14 @@ import void Platform_SetMTime (Platform_FileIdentity *target, ADDRESS *target__t
 import void Platform_SetQuitHandler (Platform_SignalHandler handler);
 import INT16 Platform_Size (INT32 h, INT32 *l);
 import INT16 Platform_Sync (INT32 h);
-import INT16 Platform_System (CHAR *cmd, LONGINT cmd__len);
+import INT16 Platform_System (CHAR *cmd, ADDRESS cmd__len);
 import INT32 Platform_Time (void);
 import BOOLEAN Platform_TimedOut (INT16 e);
 import BOOLEAN Platform_TooManyFiles (INT16 e);
 import INT16 Platform_Truncate (INT32 h, INT32 l);
-import INT16 Platform_Unlink (CHAR *n, LONGINT n__len);
+import INT16 Platform_Unlink (CHAR *n, ADDRESS n__len);
 import INT16 Platform_Write (INT32 h, INT32 p, INT32 l);
-import BOOLEAN Platform_getEnv (CHAR *var, LONGINT var__len, CHAR *val, LONGINT val__len);
+import BOOLEAN Platform_getEnv (CHAR *var, ADDRESS var__len, CHAR *val, ADDRESS val__len);
 import void *Platform__init(void);
 
 
diff --git a/bootstrap/unix-44/Reals.c b/bootstrap/unix-44/Reals.c
index cd4c3c61..be3ad909 100644
--- a/bootstrap/unix-44/Reals.c
+++ b/bootstrap/unix-44/Reals.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
@@ -10,11 +10,11 @@
 
 
 
-static void Reals_BytesToHex (SYSTEM_BYTE *b, LONGINT b__len, SYSTEM_BYTE *d, LONGINT d__len);
-export void Reals_Convert (REAL x, INT16 n, CHAR *d, LONGINT d__len);
-export void Reals_ConvertH (REAL y, CHAR *d, LONGINT d__len);
-export void Reals_ConvertHL (LONGREAL x, CHAR *d, LONGINT d__len);
-export void Reals_ConvertL (LONGREAL x, INT16 n, CHAR *d, LONGINT d__len);
+static void Reals_BytesToHex (SYSTEM_BYTE *b, ADDRESS b__len, SYSTEM_BYTE *d, ADDRESS d__len);
+export void Reals_Convert (REAL x, INT16 n, CHAR *d, ADDRESS d__len);
+export void Reals_ConvertH (REAL y, CHAR *d, ADDRESS d__len);
+export void Reals_ConvertHL (LONGREAL x, CHAR *d, ADDRESS d__len);
+export void Reals_ConvertL (LONGREAL x, INT16 n, CHAR *d, ADDRESS d__len);
 export INT16 Reals_Expo (REAL x);
 export INT16 Reals_ExpoL (LONGREAL x);
 export void Reals_SetExpo (REAL *x, INT16 ex);
@@ -79,7 +79,7 @@ INT16 Reals_ExpoL (LONGREAL x)
 	return __MASK(__ASHR(i, 4), -2048);
 }
 
-void Reals_ConvertL (LONGREAL x, INT16 n, CHAR *d, LONGINT d__len)
+void Reals_ConvertL (LONGREAL x, INT16 n, CHAR *d, ADDRESS d__len)
 {
 	INT32 i, j, k;
 	if (x < (LONGREAL)0) {
@@ -107,7 +107,7 @@ void Reals_ConvertL (LONGREAL x, INT16 n, CHAR *d, LONGINT d__len)
 	}
 }
 
-void Reals_Convert (REAL x, INT16 n, CHAR *d, LONGINT d__len)
+void Reals_Convert (REAL x, INT16 n, CHAR *d, ADDRESS d__len)
 {
 	Reals_ConvertL(x, n, (void*)d, d__len);
 }
@@ -122,7 +122,7 @@ static CHAR Reals_ToHex (INT16 i)
 	__RETCHK;
 }
 
-static void Reals_BytesToHex (SYSTEM_BYTE *b, LONGINT b__len, SYSTEM_BYTE *d, LONGINT d__len)
+static void Reals_BytesToHex (SYSTEM_BYTE *b, ADDRESS b__len, SYSTEM_BYTE *d, ADDRESS d__len)
 {
 	INT16 i;
 	INT32 l;
@@ -137,12 +137,12 @@ static void Reals_BytesToHex (SYSTEM_BYTE *b, LONGINT b__len, SYSTEM_BYTE *d, LO
 	}
 }
 
-void Reals_ConvertH (REAL y, CHAR *d, LONGINT d__len)
+void Reals_ConvertH (REAL y, CHAR *d, ADDRESS d__len)
 {
 	Reals_BytesToHex((void*)&y, 4, (void*)d, d__len * 1);
 }
 
-void Reals_ConvertHL (LONGREAL x, CHAR *d, LONGINT d__len)
+void Reals_ConvertHL (LONGREAL x, CHAR *d, ADDRESS d__len)
 {
 	Reals_BytesToHex((void*)&x, 8, (void*)d, d__len * 1);
 }
diff --git a/bootstrap/unix-44/Reals.h b/bootstrap/unix-44/Reals.h
index f0c84ab1..e8d15a2f 100644
--- a/bootstrap/unix-44/Reals.h
+++ b/bootstrap/unix-44/Reals.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef Reals__h
 #define Reals__h
@@ -8,10 +8,10 @@
 
 
 
-import void Reals_Convert (REAL x, INT16 n, CHAR *d, LONGINT d__len);
-import void Reals_ConvertH (REAL y, CHAR *d, LONGINT d__len);
-import void Reals_ConvertHL (LONGREAL x, CHAR *d, LONGINT d__len);
-import void Reals_ConvertL (LONGREAL x, INT16 n, CHAR *d, LONGINT d__len);
+import void Reals_Convert (REAL x, INT16 n, CHAR *d, ADDRESS d__len);
+import void Reals_ConvertH (REAL y, CHAR *d, ADDRESS d__len);
+import void Reals_ConvertHL (LONGREAL x, CHAR *d, ADDRESS d__len);
+import void Reals_ConvertL (LONGREAL x, INT16 n, CHAR *d, ADDRESS d__len);
 import INT16 Reals_Expo (REAL x);
 import INT16 Reals_ExpoL (LONGREAL x);
 import void Reals_SetExpo (REAL *x, INT16 ex);
diff --git a/bootstrap/unix-44/Strings.c b/bootstrap/unix-44/Strings.c
index b5707327..fd550df3 100644
--- a/bootstrap/unix-44/Strings.c
+++ b/bootstrap/unix-44/Strings.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
@@ -10,18 +10,18 @@
 
 
 
-export void Strings_Append (CHAR *extra, LONGINT extra__len, CHAR *dest, LONGINT dest__len);
-export void Strings_Cap (CHAR *s, LONGINT s__len);
-export void Strings_Delete (CHAR *s, LONGINT s__len, INT16 pos, INT16 n);
-export void Strings_Extract (CHAR *source, LONGINT source__len, INT16 pos, INT16 n, CHAR *dest, LONGINT dest__len);
-export void Strings_Insert (CHAR *source, LONGINT source__len, INT16 pos, CHAR *dest, LONGINT dest__len);
-export INT16 Strings_Length (CHAR *s, LONGINT s__len);
-export BOOLEAN Strings_Match (CHAR *string, LONGINT string__len, CHAR *pattern, LONGINT pattern__len);
-export INT16 Strings_Pos (CHAR *pattern, LONGINT pattern__len, CHAR *s, LONGINT s__len, INT16 pos);
-export void Strings_Replace (CHAR *source, LONGINT source__len, INT16 pos, CHAR *dest, LONGINT dest__len);
+export void Strings_Append (CHAR *extra, ADDRESS extra__len, CHAR *dest, ADDRESS dest__len);
+export void Strings_Cap (CHAR *s, ADDRESS s__len);
+export void Strings_Delete (CHAR *s, ADDRESS s__len, INT16 pos, INT16 n);
+export void Strings_Extract (CHAR *source, ADDRESS source__len, INT16 pos, INT16 n, CHAR *dest, ADDRESS dest__len);
+export void Strings_Insert (CHAR *source, ADDRESS source__len, INT16 pos, CHAR *dest, ADDRESS dest__len);
+export INT16 Strings_Length (CHAR *s, ADDRESS s__len);
+export BOOLEAN Strings_Match (CHAR *string, ADDRESS string__len, CHAR *pattern, ADDRESS pattern__len);
+export INT16 Strings_Pos (CHAR *pattern, ADDRESS pattern__len, CHAR *s, ADDRESS s__len, INT16 pos);
+export void Strings_Replace (CHAR *source, ADDRESS source__len, INT16 pos, CHAR *dest, ADDRESS dest__len);
 
 
-INT16 Strings_Length (CHAR *s, LONGINT s__len)
+INT16 Strings_Length (CHAR *s, ADDRESS s__len)
 {
 	INT32 i;
 	__DUP(s, s__len, CHAR);
@@ -39,7 +39,7 @@ INT16 Strings_Length (CHAR *s, LONGINT s__len)
 	__RETCHK;
 }
 
-void Strings_Append (CHAR *extra, LONGINT extra__len, CHAR *dest, LONGINT dest__len)
+void Strings_Append (CHAR *extra, ADDRESS extra__len, CHAR *dest, ADDRESS dest__len)
 {
 	INT16 n1, n2, i;
 	__DUP(extra, extra__len, CHAR);
@@ -56,7 +56,7 @@ void Strings_Append (CHAR *extra, LONGINT extra__len, CHAR *dest, LONGINT dest__
 	__DEL(extra);
 }
 
-void Strings_Insert (CHAR *source, LONGINT source__len, INT16 pos, CHAR *dest, LONGINT dest__len)
+void Strings_Insert (CHAR *source, ADDRESS source__len, INT16 pos, CHAR *dest, ADDRESS dest__len)
 {
 	INT16 n1, n2, i;
 	__DUP(source, source__len, CHAR);
@@ -87,7 +87,7 @@ void Strings_Insert (CHAR *source, LONGINT source__len, INT16 pos, CHAR *dest, L
 	__DEL(source);
 }
 
-void Strings_Delete (CHAR *s, LONGINT s__len, INT16 pos, INT16 n)
+void Strings_Delete (CHAR *s, ADDRESS s__len, INT16 pos, INT16 n)
 {
 	INT16 len, i;
 	len = Strings_Length(s, s__len);
@@ -110,7 +110,7 @@ void Strings_Delete (CHAR *s, LONGINT s__len, INT16 pos, INT16 n)
 	}
 }
 
-void Strings_Replace (CHAR *source, LONGINT source__len, INT16 pos, CHAR *dest, LONGINT dest__len)
+void Strings_Replace (CHAR *source, ADDRESS source__len, INT16 pos, CHAR *dest, ADDRESS dest__len)
 {
 	__DUP(source, source__len, CHAR);
 	Strings_Delete((void*)dest, dest__len, pos, pos + Strings_Length(source, source__len));
@@ -118,7 +118,7 @@ void Strings_Replace (CHAR *source, LONGINT source__len, INT16 pos, CHAR *dest,
 	__DEL(source);
 }
 
-void Strings_Extract (CHAR *source, LONGINT source__len, INT16 pos, INT16 n, CHAR *dest, LONGINT dest__len)
+void Strings_Extract (CHAR *source, ADDRESS source__len, INT16 pos, INT16 n, CHAR *dest, ADDRESS dest__len)
 {
 	INT16 len, destLen, i;
 	__DUP(source, source__len, CHAR);
@@ -143,7 +143,7 @@ void Strings_Extract (CHAR *source, LONGINT source__len, INT16 pos, INT16 n, CHA
 	__DEL(source);
 }
 
-INT16 Strings_Pos (CHAR *pattern, LONGINT pattern__len, CHAR *s, LONGINT s__len, INT16 pos)
+INT16 Strings_Pos (CHAR *pattern, ADDRESS pattern__len, CHAR *s, ADDRESS s__len, INT16 pos)
 {
 	INT16 n1, n2, i, j;
 	__DUP(pattern, pattern__len, CHAR);
@@ -175,7 +175,7 @@ INT16 Strings_Pos (CHAR *pattern, LONGINT pattern__len, CHAR *s, LONGINT s__len,
 	return -1;
 }
 
-void Strings_Cap (CHAR *s, LONGINT s__len)
+void Strings_Cap (CHAR *s, ADDRESS s__len)
 {
 	INT16 i;
 	i = 0;
@@ -191,9 +191,9 @@ static struct Match__7 {
 	struct Match__7 *lnk;
 } *Match__7_s;
 
-static BOOLEAN M__8 (CHAR *name, LONGINT name__len, CHAR *mask, LONGINT mask__len, INT16 n, INT16 m);
+static BOOLEAN M__8 (CHAR *name, ADDRESS name__len, CHAR *mask, ADDRESS mask__len, INT16 n, INT16 m);
 
-static BOOLEAN M__8 (CHAR *name, LONGINT name__len, CHAR *mask, LONGINT mask__len, INT16 n, INT16 m)
+static BOOLEAN M__8 (CHAR *name, ADDRESS name__len, CHAR *mask, ADDRESS mask__len, INT16 n, INT16 m)
 {
 	while ((((n >= 0 && m >= 0)) && mask[__X(m, mask__len)] != '*')) {
 		if (name[__X(n, name__len)] != mask[__X(m, mask__len)]) {
@@ -220,7 +220,7 @@ static BOOLEAN M__8 (CHAR *name, LONGINT name__len, CHAR *mask, LONGINT mask__le
 	return 0;
 }
 
-BOOLEAN Strings_Match (CHAR *string, LONGINT string__len, CHAR *pattern, LONGINT pattern__len)
+BOOLEAN Strings_Match (CHAR *string, ADDRESS string__len, CHAR *pattern, ADDRESS pattern__len)
 {
 	struct Match__7 _s;
 	BOOLEAN __retval;
diff --git a/bootstrap/unix-44/Strings.h b/bootstrap/unix-44/Strings.h
index c987af8d..76cb022d 100644
--- a/bootstrap/unix-44/Strings.h
+++ b/bootstrap/unix-44/Strings.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef Strings__h
 #define Strings__h
@@ -8,15 +8,15 @@
 
 
 
-import void Strings_Append (CHAR *extra, LONGINT extra__len, CHAR *dest, LONGINT dest__len);
-import void Strings_Cap (CHAR *s, LONGINT s__len);
-import void Strings_Delete (CHAR *s, LONGINT s__len, INT16 pos, INT16 n);
-import void Strings_Extract (CHAR *source, LONGINT source__len, INT16 pos, INT16 n, CHAR *dest, LONGINT dest__len);
-import void Strings_Insert (CHAR *source, LONGINT source__len, INT16 pos, CHAR *dest, LONGINT dest__len);
-import INT16 Strings_Length (CHAR *s, LONGINT s__len);
-import BOOLEAN Strings_Match (CHAR *string, LONGINT string__len, CHAR *pattern, LONGINT pattern__len);
-import INT16 Strings_Pos (CHAR *pattern, LONGINT pattern__len, CHAR *s, LONGINT s__len, INT16 pos);
-import void Strings_Replace (CHAR *source, LONGINT source__len, INT16 pos, CHAR *dest, LONGINT dest__len);
+import void Strings_Append (CHAR *extra, ADDRESS extra__len, CHAR *dest, ADDRESS dest__len);
+import void Strings_Cap (CHAR *s, ADDRESS s__len);
+import void Strings_Delete (CHAR *s, ADDRESS s__len, INT16 pos, INT16 n);
+import void Strings_Extract (CHAR *source, ADDRESS source__len, INT16 pos, INT16 n, CHAR *dest, ADDRESS dest__len);
+import void Strings_Insert (CHAR *source, ADDRESS source__len, INT16 pos, CHAR *dest, ADDRESS dest__len);
+import INT16 Strings_Length (CHAR *s, ADDRESS s__len);
+import BOOLEAN Strings_Match (CHAR *string, ADDRESS string__len, CHAR *pattern, ADDRESS pattern__len);
+import INT16 Strings_Pos (CHAR *pattern, ADDRESS pattern__len, CHAR *s, ADDRESS s__len, INT16 pos);
+import void Strings_Replace (CHAR *source, ADDRESS source__len, INT16 pos, CHAR *dest, ADDRESS dest__len);
 import void *Strings__init(void);
 
 
diff --git a/bootstrap/unix-44/Texts.c b/bootstrap/unix-44/Texts.c
index 0ac5c5f2..f304b8bf 100644
--- a/bootstrap/unix-44/Texts.c
+++ b/bootstrap/unix-44/Texts.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
@@ -187,20 +187,20 @@ export void Texts_Append (Texts_Text T, Texts_Buffer B);
 export void Texts_ChangeLooks (Texts_Text T, INT32 beg, INT32 end, UINT32 sel, Texts_FontsFont fnt, INT8 col, INT8 voff);
 static Texts_Elem Texts_CloneElem (Texts_Elem e);
 static Texts_Piece Texts_ClonePiece (Texts_Piece p);
-export void Texts_Close (Texts_Text T, CHAR *name, LONGINT name__len);
+export void Texts_Close (Texts_Text T, CHAR *name, ADDRESS name__len);
 export void Texts_Copy (Texts_Buffer SB, Texts_Buffer DB);
 export void Texts_CopyElem (Texts_Elem SE, Texts_Elem DE);
 export void Texts_Delete (Texts_Text T, INT32 beg, INT32 end);
 export Texts_Text Texts_ElemBase (Texts_Elem E);
 export INT32 Texts_ElemPos (Texts_Elem E);
 static void Texts_Find (Texts_Text T, INT32 *pos, Texts_Run *u, INT32 *org, INT32 *off);
-static Texts_FontsFont Texts_FontsThis (CHAR *name, LONGINT name__len);
+static Texts_FontsFont Texts_FontsThis (CHAR *name, ADDRESS name__len);
 static void Texts_HandleAlien (Texts_Elem E, Texts_ElemMsg *msg, ADDRESS *msg__typ);
 export void Texts_Insert (Texts_Text T, INT32 pos, Texts_Buffer B);
 export void Texts_Load (Files_Rider *r, ADDRESS *r__typ, Texts_Text T);
 static void Texts_Load0 (Files_Rider *r, ADDRESS *r__typ, Texts_Text T);
 static void Texts_Merge (Texts_Text T, Texts_Run u, Texts_Run *v);
-export void Texts_Open (Texts_Text T, CHAR *name, LONGINT name__len);
+export void Texts_Open (Texts_Text T, CHAR *name, ADDRESS name__len);
 export void Texts_OpenBuf (Texts_Buffer B);
 export void Texts_OpenReader (Texts_Reader *R, ADDRESS *R__typ, Texts_Text T, INT32 pos);
 export void Texts_OpenScanner (Texts_Scanner *S, ADDRESS *S__typ, Texts_Text T, INT32 pos);
@@ -229,10 +229,10 @@ export void Texts_WriteLongRealHex (Texts_Writer *W, ADDRESS *W__typ, LONGREAL x
 export void Texts_WriteReal (Texts_Writer *W, ADDRESS *W__typ, REAL x, INT16 n);
 export void Texts_WriteRealFix (Texts_Writer *W, ADDRESS *W__typ, REAL x, INT16 n, INT16 k);
 export void Texts_WriteRealHex (Texts_Writer *W, ADDRESS *W__typ, REAL x);
-export void Texts_WriteString (Texts_Writer *W, ADDRESS *W__typ, CHAR *s, LONGINT s__len);
+export void Texts_WriteString (Texts_Writer *W, ADDRESS *W__typ, CHAR *s, ADDRESS s__len);
 
 
-static Texts_FontsFont Texts_FontsThis (CHAR *name, LONGINT name__len)
+static Texts_FontsFont Texts_FontsThis (CHAR *name, ADDRESS name__len)
 {
 	Texts_FontsFont F = NIL;
 	__NEW(F, Texts_FontDesc);
@@ -1027,7 +1027,7 @@ void Texts_WriteLn (Texts_Writer *W, ADDRESS *W__typ)
 	Texts_Write(&*W, W__typ, 0x0d);
 }
 
-void Texts_WriteString (Texts_Writer *W, ADDRESS *W__typ, CHAR *s, LONGINT s__len)
+void Texts_WriteString (Texts_Writer *W, ADDRESS *W__typ, CHAR *s, ADDRESS s__len)
 {
 	INT16 i;
 	__DUP(s, s__len, CHAR);
@@ -1539,7 +1539,7 @@ void Texts_Load (Files_Rider *r, ADDRESS *r__typ, Texts_Text T)
 	Texts_Load0(&*r, r__typ, T);
 }
 
-void Texts_Open (Texts_Text T, CHAR *name, LONGINT name__len)
+void Texts_Open (Texts_Text T, CHAR *name, ADDRESS name__len)
 {
 	Files_File f = NIL;
 	Files_Rider r;
@@ -1755,7 +1755,7 @@ void Texts_Store (Files_Rider *r, ADDRESS *r__typ, Texts_Text T)
 	Store__39_s = _s.lnk;
 }
 
-void Texts_Close (Texts_Text T, CHAR *name, LONGINT name__len)
+void Texts_Close (Texts_Text T, CHAR *name, ADDRESS name__len)
 {
 	Files_File f = NIL;
 	Files_Rider r;
diff --git a/bootstrap/unix-44/Texts.h b/bootstrap/unix-44/Texts.h
index 0d5201cb..ecdf9223 100644
--- a/bootstrap/unix-44/Texts.h
+++ b/bootstrap/unix-44/Texts.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef Texts__h
 #define Texts__h
@@ -130,7 +130,7 @@ import ADDRESS *Texts_Writer__typ;
 
 import void Texts_Append (Texts_Text T, Texts_Buffer B);
 import void Texts_ChangeLooks (Texts_Text T, INT32 beg, INT32 end, UINT32 sel, Texts_FontsFont fnt, INT8 col, INT8 voff);
-import void Texts_Close (Texts_Text T, CHAR *name, LONGINT name__len);
+import void Texts_Close (Texts_Text T, CHAR *name, ADDRESS name__len);
 import void Texts_Copy (Texts_Buffer SB, Texts_Buffer DB);
 import void Texts_CopyElem (Texts_Elem SE, Texts_Elem DE);
 import void Texts_Delete (Texts_Text T, INT32 beg, INT32 end);
@@ -138,7 +138,7 @@ import Texts_Text Texts_ElemBase (Texts_Elem E);
 import INT32 Texts_ElemPos (Texts_Elem E);
 import void Texts_Insert (Texts_Text T, INT32 pos, Texts_Buffer B);
 import void Texts_Load (Files_Rider *r, ADDRESS *r__typ, Texts_Text T);
-import void Texts_Open (Texts_Text T, CHAR *name, LONGINT name__len);
+import void Texts_Open (Texts_Text T, CHAR *name, ADDRESS name__len);
 import void Texts_OpenBuf (Texts_Buffer B);
 import void Texts_OpenReader (Texts_Reader *R, ADDRESS *R__typ, Texts_Text T, INT32 pos);
 import void Texts_OpenScanner (Texts_Scanner *S, ADDRESS *S__typ, Texts_Text T, INT32 pos);
@@ -165,7 +165,7 @@ import void Texts_WriteLongRealHex (Texts_Writer *W, ADDRESS *W__typ, LONGREAL x
 import void Texts_WriteReal (Texts_Writer *W, ADDRESS *W__typ, REAL x, INT16 n);
 import void Texts_WriteRealFix (Texts_Writer *W, ADDRESS *W__typ, REAL x, INT16 n, INT16 k);
 import void Texts_WriteRealHex (Texts_Writer *W, ADDRESS *W__typ, REAL x);
-import void Texts_WriteString (Texts_Writer *W, ADDRESS *W__typ, CHAR *s, LONGINT s__len);
+import void Texts_WriteString (Texts_Writer *W, ADDRESS *W__typ, CHAR *s, ADDRESS s__len);
 import void *Texts__init(void);
 
 
diff --git a/bootstrap/unix-44/VT100.c b/bootstrap/unix-44/VT100.c
index f69fd90e..38c0743f 100644
--- a/bootstrap/unix-44/VT100.c
+++ b/bootstrap/unix-44/VT100.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
@@ -27,23 +27,23 @@ export void VT100_DECTCEMl (void);
 export void VT100_DSR (INT16 n);
 export void VT100_ED (INT16 n);
 export void VT100_EL (INT16 n);
-static void VT100_EscSeq (INT16 n, CHAR *letter, LONGINT letter__len);
-static void VT100_EscSeq0 (CHAR *letter, LONGINT letter__len);
-static void VT100_EscSeq2 (INT16 n, INT16 m, CHAR *letter, LONGINT letter__len);
-static void VT100_EscSeqSwapped (INT16 n, CHAR *letter, LONGINT letter__len);
+static void VT100_EscSeq (INT16 n, CHAR *letter, ADDRESS letter__len);
+static void VT100_EscSeq0 (CHAR *letter, ADDRESS letter__len);
+static void VT100_EscSeq2 (INT16 n, INT16 m, CHAR *letter, ADDRESS letter__len);
+static void VT100_EscSeqSwapped (INT16 n, CHAR *letter, ADDRESS letter__len);
 export void VT100_HVP (INT16 n, INT16 m);
-export void VT100_IntToStr (INT32 int_, CHAR *str, LONGINT str__len);
+export void VT100_IntToStr (INT32 int_, CHAR *str, ADDRESS str__len);
 export void VT100_RCP (void);
-static void VT100_Reverse0 (CHAR *str, LONGINT str__len, INT16 start, INT16 end);
+static void VT100_Reverse0 (CHAR *str, ADDRESS str__len, INT16 start, INT16 end);
 export void VT100_SCP (void);
 export void VT100_SD (INT16 n);
 export void VT100_SGR (INT16 n);
 export void VT100_SGR2 (INT16 n, INT16 m);
 export void VT100_SU (INT16 n);
-export void VT100_SetAttr (CHAR *attr, LONGINT attr__len);
+export void VT100_SetAttr (CHAR *attr, ADDRESS attr__len);
 
 
-static void VT100_Reverse0 (CHAR *str, LONGINT str__len, INT16 start, INT16 end)
+static void VT100_Reverse0 (CHAR *str, ADDRESS str__len, INT16 start, INT16 end)
 {
 	CHAR h;
 	while (start < end) {
@@ -55,7 +55,7 @@ static void VT100_Reverse0 (CHAR *str, LONGINT str__len, INT16 start, INT16 end)
 	}
 }
 
-void VT100_IntToStr (INT32 int_, CHAR *str, LONGINT str__len)
+void VT100_IntToStr (INT32 int_, CHAR *str, ADDRESS str__len)
 {
 	CHAR b[21];
 	INT16 s, e;
@@ -84,7 +84,7 @@ void VT100_IntToStr (INT32 int_, CHAR *str, LONGINT str__len)
 	__COPY(b, str, str__len);
 }
 
-static void VT100_EscSeq0 (CHAR *letter, LONGINT letter__len)
+static void VT100_EscSeq0 (CHAR *letter, ADDRESS letter__len)
 {
 	CHAR cmd[9];
 	__DUP(letter, letter__len, CHAR);
@@ -94,7 +94,7 @@ static void VT100_EscSeq0 (CHAR *letter, LONGINT letter__len)
 	__DEL(letter);
 }
 
-static void VT100_EscSeq (INT16 n, CHAR *letter, LONGINT letter__len)
+static void VT100_EscSeq (INT16 n, CHAR *letter, ADDRESS letter__len)
 {
 	CHAR nstr[2];
 	CHAR cmd[7];
@@ -107,7 +107,7 @@ static void VT100_EscSeq (INT16 n, CHAR *letter, LONGINT letter__len)
 	__DEL(letter);
 }
 
-static void VT100_EscSeqSwapped (INT16 n, CHAR *letter, LONGINT letter__len)
+static void VT100_EscSeqSwapped (INT16 n, CHAR *letter, ADDRESS letter__len)
 {
 	CHAR nstr[2];
 	CHAR cmd[7];
@@ -120,7 +120,7 @@ static void VT100_EscSeqSwapped (INT16 n, CHAR *letter, LONGINT letter__len)
 	__DEL(letter);
 }
 
-static void VT100_EscSeq2 (INT16 n, INT16 m, CHAR *letter, LONGINT letter__len)
+static void VT100_EscSeq2 (INT16 n, INT16 m, CHAR *letter, ADDRESS letter__len)
 {
 	CHAR nstr[5], mstr[5];
 	CHAR cmd[12];
@@ -236,7 +236,7 @@ void VT100_DECTCEMh (void)
 	VT100_EscSeq0((CHAR*)"\?25h", 5);
 }
 
-void VT100_SetAttr (CHAR *attr, LONGINT attr__len)
+void VT100_SetAttr (CHAR *attr, ADDRESS attr__len)
 {
 	CHAR tmpstr[16];
 	__DUP(attr, attr__len, CHAR);
diff --git a/bootstrap/unix-44/VT100.h b/bootstrap/unix-44/VT100.h
index d99406ec..4bbb3110 100644
--- a/bootstrap/unix-44/VT100.h
+++ b/bootstrap/unix-44/VT100.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef VT100__h
 #define VT100__h
@@ -23,14 +23,14 @@ import void VT100_DSR (INT16 n);
 import void VT100_ED (INT16 n);
 import void VT100_EL (INT16 n);
 import void VT100_HVP (INT16 n, INT16 m);
-import void VT100_IntToStr (INT32 int_, CHAR *str, LONGINT str__len);
+import void VT100_IntToStr (INT32 int_, CHAR *str, ADDRESS str__len);
 import void VT100_RCP (void);
 import void VT100_SCP (void);
 import void VT100_SD (INT16 n);
 import void VT100_SGR (INT16 n);
 import void VT100_SGR2 (INT16 n, INT16 m);
 import void VT100_SU (INT16 n);
-import void VT100_SetAttr (CHAR *attr, LONGINT attr__len);
+import void VT100_SetAttr (CHAR *attr, ADDRESS attr__len);
 import void *VT100__init(void);
 
 
diff --git a/bootstrap/unix-44/extTools.c b/bootstrap/unix-44/extTools.c
index 37630d23..66f80319 100644
--- a/bootstrap/unix-44/extTools.c
+++ b/bootstrap/unix-44/extTools.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
@@ -17,13 +17,13 @@
 static CHAR extTools_CFLAGS[1023];
 
 
-export void extTools_Assemble (CHAR *moduleName, LONGINT moduleName__len);
-static void extTools_InitialiseCompilerCommand (CHAR *s, LONGINT s__len);
-export void extTools_LinkMain (CHAR *moduleName, LONGINT moduleName__len, BOOLEAN statically, CHAR *additionalopts, LONGINT additionalopts__len);
-static void extTools_execute (CHAR *title, LONGINT title__len, CHAR *cmd, LONGINT cmd__len);
+export void extTools_Assemble (CHAR *moduleName, ADDRESS moduleName__len);
+static void extTools_InitialiseCompilerCommand (CHAR *s, ADDRESS s__len);
+export void extTools_LinkMain (CHAR *moduleName, ADDRESS moduleName__len, BOOLEAN statically, CHAR *additionalopts, ADDRESS additionalopts__len);
+static void extTools_execute (CHAR *title, ADDRESS title__len, CHAR *cmd, ADDRESS cmd__len);
 
 
-static void extTools_execute (CHAR *title, LONGINT title__len, CHAR *cmd, LONGINT cmd__len)
+static void extTools_execute (CHAR *title, ADDRESS title__len, CHAR *cmd, ADDRESS cmd__len)
 {
 	INT16 r, status, exitcode;
 	__DUP(title, title__len, CHAR);
@@ -63,7 +63,7 @@ static void extTools_execute (CHAR *title, LONGINT title__len, CHAR *cmd, LONGIN
 	__DEL(cmd);
 }
 
-static void extTools_InitialiseCompilerCommand (CHAR *s, LONGINT s__len)
+static void extTools_InitialiseCompilerCommand (CHAR *s, ADDRESS s__len)
 {
 	__COPY("gcc -g", s, s__len);
 	Strings_Append((CHAR*)" -I \"", 6, (void*)s, s__len);
@@ -74,7 +74,7 @@ static void extTools_InitialiseCompilerCommand (CHAR *s, LONGINT s__len)
 	Strings_Append((CHAR*)" ", 2, (void*)s, s__len);
 }
 
-void extTools_Assemble (CHAR *moduleName, LONGINT moduleName__len)
+void extTools_Assemble (CHAR *moduleName, ADDRESS moduleName__len)
 {
 	CHAR cmd[1023];
 	__DUP(moduleName, moduleName__len, CHAR);
@@ -86,7 +86,7 @@ void extTools_Assemble (CHAR *moduleName, LONGINT moduleName__len)
 	__DEL(moduleName);
 }
 
-void extTools_LinkMain (CHAR *moduleName, LONGINT moduleName__len, BOOLEAN statically, CHAR *additionalopts, LONGINT additionalopts__len)
+void extTools_LinkMain (CHAR *moduleName, ADDRESS moduleName__len, BOOLEAN statically, CHAR *additionalopts, ADDRESS additionalopts__len)
 {
 	CHAR cmd[1023];
 	__DUP(additionalopts, additionalopts__len, CHAR);
diff --git a/bootstrap/unix-44/extTools.h b/bootstrap/unix-44/extTools.h
index 63e5df15..472c60f3 100644
--- a/bootstrap/unix-44/extTools.h
+++ b/bootstrap/unix-44/extTools.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef extTools__h
 #define extTools__h
@@ -8,8 +8,8 @@
 
 
 
-import void extTools_Assemble (CHAR *moduleName, LONGINT moduleName__len);
-import void extTools_LinkMain (CHAR *moduleName, LONGINT moduleName__len, BOOLEAN statically, CHAR *additionalopts, LONGINT additionalopts__len);
+import void extTools_Assemble (CHAR *moduleName, ADDRESS moduleName__len);
+import void extTools_LinkMain (CHAR *moduleName, ADDRESS moduleName__len, BOOLEAN statically, CHAR *additionalopts, ADDRESS additionalopts__len);
 import void *extTools__init(void);
 
 
diff --git a/bootstrap/unix-48/Compiler.c b/bootstrap/unix-48/Compiler.c
index dc4bb660..e900905f 100644
--- a/bootstrap/unix-48/Compiler.c
+++ b/bootstrap/unix-48/Compiler.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. xtspamS */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. xtspamS */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/unix-48/Configuration.c b/bootstrap/unix-48/Configuration.c
index 2d0061df..071d7b8e 100644
--- a/bootstrap/unix-48/Configuration.c
+++ b/bootstrap/unix-48/Configuration.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
@@ -19,6 +19,6 @@ export void *Configuration__init(void)
 	__DEFMOD;
 	__REGMOD("Configuration", 0);
 /* BEGIN */
-	__MOVE("1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8.", Configuration_versionLong, 75);
+	__MOVE("2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8.", Configuration_versionLong, 75);
 	__ENDMOD;
 }
diff --git a/bootstrap/unix-48/Configuration.h b/bootstrap/unix-48/Configuration.h
index b28e0caa..b1942442 100644
--- a/bootstrap/unix-48/Configuration.h
+++ b/bootstrap/unix-48/Configuration.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef Configuration__h
 #define Configuration__h
diff --git a/bootstrap/unix-48/Files.c b/bootstrap/unix-48/Files.c
index 548774b0..0a3293ab 100644
--- a/bootstrap/unix-48/Files.c
+++ b/bootstrap/unix-48/Files.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. tspaSF */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. tspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
@@ -52,7 +52,7 @@ static Files_File Files_files;
 static INT16 Files_tempno;
 static CHAR Files_HOME[1024];
 static struct {
-	LONGINT len[1];
+	ADDRESS len[1];
 	CHAR data[1];
 } *Files_SearchPath;
 
@@ -62,56 +62,56 @@ export ADDRESS *Files_Rider__typ;
 
 export Files_File Files_Base (Files_Rider *r, ADDRESS *r__typ);
 static Files_File Files_CacheEntry (Platform_FileIdentity identity);
-export void Files_ChangeDirectory (CHAR *path, LONGINT path__len, INT16 *res);
+export void Files_ChangeDirectory (CHAR *path, ADDRESS path__len, INT16 *res);
 export void Files_Close (Files_File f);
 static void Files_CloseOSFile (Files_File f);
 static void Files_Create (Files_File f);
-export void Files_Delete (CHAR *name, LONGINT name__len, INT16 *res);
-static void Files_Err (CHAR *s, LONGINT s__len, Files_File f, INT16 errcode);
+export void Files_Delete (CHAR *name, ADDRESS name__len, INT16 *res);
+static void Files_Err (CHAR *s, ADDRESS s__len, Files_File f, INT16 errcode);
 static void Files_Finalize (SYSTEM_PTR o);
-static void Files_FlipBytes (SYSTEM_BYTE *src, LONGINT src__len, SYSTEM_BYTE *dest, LONGINT dest__len);
+static void Files_FlipBytes (SYSTEM_BYTE *src, ADDRESS src__len, SYSTEM_BYTE *dest, ADDRESS dest__len);
 static void Files_Flush (Files_Buffer buf);
 export void Files_GetDate (Files_File f, INT32 *t, INT32 *d);
-export void Files_GetName (Files_File f, CHAR *name, LONGINT name__len);
-static void Files_GetTempName (CHAR *finalName, LONGINT finalName__len, CHAR *name, LONGINT name__len);
-static BOOLEAN Files_HasDir (CHAR *name, LONGINT name__len);
+export void Files_GetName (Files_File f, CHAR *name, ADDRESS name__len);
+static void Files_GetTempName (CHAR *finalName, ADDRESS finalName__len, CHAR *name, ADDRESS name__len);
+static BOOLEAN Files_HasDir (CHAR *name, ADDRESS name__len);
 export INT32 Files_Length (Files_File f);
-static void Files_MakeFileName (CHAR *dir, LONGINT dir__len, CHAR *name, LONGINT name__len, CHAR *dest, LONGINT dest__len);
-export Files_File Files_New (CHAR *name, LONGINT name__len);
-export Files_File Files_Old (CHAR *name, LONGINT name__len);
+static void Files_MakeFileName (CHAR *dir, ADDRESS dir__len, CHAR *name, ADDRESS name__len, CHAR *dest, ADDRESS dest__len);
+export Files_File Files_New (CHAR *name, ADDRESS name__len);
+export Files_File Files_Old (CHAR *name, ADDRESS name__len);
 export INT32 Files_Pos (Files_Rider *r, ADDRESS *r__typ);
 export void Files_Purge (Files_File f);
 export void Files_Read (Files_Rider *r, ADDRESS *r__typ, SYSTEM_BYTE *x);
 export void Files_ReadBool (Files_Rider *R, ADDRESS *R__typ, BOOLEAN *x);
-export void Files_ReadBytes (Files_Rider *r, ADDRESS *r__typ, SYSTEM_BYTE *x, LONGINT x__len, INT32 n);
+export void Files_ReadBytes (Files_Rider *r, ADDRESS *r__typ, SYSTEM_BYTE *x, ADDRESS x__len, INT32 n);
 export void Files_ReadInt (Files_Rider *R, ADDRESS *R__typ, INT16 *x);
 export void Files_ReadLInt (Files_Rider *R, ADDRESS *R__typ, INT32 *x);
 export void Files_ReadLReal (Files_Rider *R, ADDRESS *R__typ, LONGREAL *x);
-export void Files_ReadLine (Files_Rider *R, ADDRESS *R__typ, CHAR *x, LONGINT x__len);
-export void Files_ReadNum (Files_Rider *R, ADDRESS *R__typ, SYSTEM_BYTE *x, LONGINT x__len);
+export void Files_ReadLine (Files_Rider *R, ADDRESS *R__typ, CHAR *x, ADDRESS x__len);
+export void Files_ReadNum (Files_Rider *R, ADDRESS *R__typ, SYSTEM_BYTE *x, ADDRESS x__len);
 export void Files_ReadReal (Files_Rider *R, ADDRESS *R__typ, REAL *x);
 export void Files_ReadSet (Files_Rider *R, ADDRESS *R__typ, UINT32 *x);
-export void Files_ReadString (Files_Rider *R, ADDRESS *R__typ, CHAR *x, LONGINT x__len);
+export void Files_ReadString (Files_Rider *R, ADDRESS *R__typ, CHAR *x, ADDRESS x__len);
 export void Files_Register (Files_File f);
-export void Files_Rename (CHAR *old, LONGINT old__len, CHAR *new, LONGINT new__len, INT16 *res);
-static void Files_ScanPath (INT16 *pos, CHAR *dir, LONGINT dir__len);
+export void Files_Rename (CHAR *old, ADDRESS old__len, CHAR *new, ADDRESS new__len, INT16 *res);
+static void Files_ScanPath (INT16 *pos, CHAR *dir, ADDRESS dir__len);
 export void Files_Set (Files_Rider *r, ADDRESS *r__typ, Files_File f, INT32 pos);
-export void Files_SetSearchPath (CHAR *path, LONGINT path__len);
+export void Files_SetSearchPath (CHAR *path, ADDRESS path__len);
 export void Files_Write (Files_Rider *r, ADDRESS *r__typ, SYSTEM_BYTE x);
 export void Files_WriteBool (Files_Rider *R, ADDRESS *R__typ, BOOLEAN x);
-export void Files_WriteBytes (Files_Rider *r, ADDRESS *r__typ, SYSTEM_BYTE *x, LONGINT x__len, INT32 n);
+export void Files_WriteBytes (Files_Rider *r, ADDRESS *r__typ, SYSTEM_BYTE *x, ADDRESS x__len, INT32 n);
 export void Files_WriteInt (Files_Rider *R, ADDRESS *R__typ, INT16 x);
 export void Files_WriteLInt (Files_Rider *R, ADDRESS *R__typ, INT32 x);
 export void Files_WriteLReal (Files_Rider *R, ADDRESS *R__typ, LONGREAL x);
 export void Files_WriteNum (Files_Rider *R, ADDRESS *R__typ, INT64 x);
 export void Files_WriteReal (Files_Rider *R, ADDRESS *R__typ, REAL x);
 export void Files_WriteSet (Files_Rider *R, ADDRESS *R__typ, UINT32 x);
-export void Files_WriteString (Files_Rider *R, ADDRESS *R__typ, CHAR *x, LONGINT x__len);
+export void Files_WriteString (Files_Rider *R, ADDRESS *R__typ, CHAR *x, ADDRESS x__len);
 
 #define Files_IdxTrap()	__HALT(-1)
 #define Files_ToAdr(x)	(ADDRESS)x
 
-static void Files_Err (CHAR *s, LONGINT s__len, Files_File f, INT16 errcode)
+static void Files_Err (CHAR *s, ADDRESS s__len, Files_File f, INT16 errcode)
 {
 	__DUP(s, s__len, CHAR);
 	Out_Ln();
@@ -138,7 +138,7 @@ static void Files_Err (CHAR *s, LONGINT s__len, Files_File f, INT16 errcode)
 	__DEL(s);
 }
 
-static void Files_MakeFileName (CHAR *dir, LONGINT dir__len, CHAR *name, LONGINT name__len, CHAR *dest, LONGINT dest__len)
+static void Files_MakeFileName (CHAR *dir, ADDRESS dir__len, CHAR *name, ADDRESS name__len, CHAR *dest, ADDRESS dest__len)
 {
 	INT16 i, j;
 	__DUP(dir, dir__len, CHAR);
@@ -163,7 +163,7 @@ static void Files_MakeFileName (CHAR *dir, LONGINT dir__len, CHAR *name, LONGINT
 	__DEL(name);
 }
 
-static void Files_GetTempName (CHAR *finalName, LONGINT finalName__len, CHAR *name, LONGINT name__len)
+static void Files_GetTempName (CHAR *finalName, ADDRESS finalName__len, CHAR *name, ADDRESS name__len)
 {
 	INT32 n, i, j;
 	__DUP(finalName, finalName__len, CHAR);
@@ -316,7 +316,7 @@ INT32 Files_Length (Files_File f)
 	return f->len;
 }
 
-Files_File Files_New (CHAR *name, LONGINT name__len)
+Files_File Files_New (CHAR *name, ADDRESS name__len)
 {
 	Files_File f = NIL;
 	__DUP(name, name__len, CHAR);
@@ -332,7 +332,7 @@ Files_File Files_New (CHAR *name, LONGINT name__len)
 	return f;
 }
 
-static void Files_ScanPath (INT16 *pos, CHAR *dir, LONGINT dir__len)
+static void Files_ScanPath (INT16 *pos, CHAR *dir, ADDRESS dir__len)
 {
 	INT16 i;
 	CHAR ch;
@@ -375,7 +375,7 @@ static void Files_ScanPath (INT16 *pos, CHAR *dir, LONGINT dir__len)
 	dir[i] = 0x00;
 }
 
-static BOOLEAN Files_HasDir (CHAR *name, LONGINT name__len)
+static BOOLEAN Files_HasDir (CHAR *name, ADDRESS name__len)
 {
 	INT16 i;
 	CHAR ch;
@@ -415,7 +415,7 @@ static Files_File Files_CacheEntry (Platform_FileIdentity identity)
 	return NIL;
 }
 
-Files_File Files_Old (CHAR *name, LONGINT name__len)
+Files_File Files_Old (CHAR *name, ADDRESS name__len)
 {
 	Files_File f = NIL;
 	INT32 fd;
@@ -618,7 +618,7 @@ void Files_Read (Files_Rider *r, ADDRESS *r__typ, SYSTEM_BYTE *x)
 	}
 }
 
-void Files_ReadBytes (Files_Rider *r, ADDRESS *r__typ, SYSTEM_BYTE *x, LONGINT x__len, INT32 n)
+void Files_ReadBytes (Files_Rider *r, ADDRESS *r__typ, SYSTEM_BYTE *x, ADDRESS x__len, INT32 n)
 {
 	INT32 xpos, min, restInBuf, offset;
 	Files_Buffer buf = NIL;
@@ -683,7 +683,7 @@ void Files_Write (Files_Rider *r, ADDRESS *r__typ, SYSTEM_BYTE x)
 	(*r).res = 0;
 }
 
-void Files_WriteBytes (Files_Rider *r, ADDRESS *r__typ, SYSTEM_BYTE *x, LONGINT x__len, INT32 n)
+void Files_WriteBytes (Files_Rider *r, ADDRESS *r__typ, SYSTEM_BYTE *x, ADDRESS x__len, INT32 n)
 {
 	INT32 xpos, min, restInBuf, offset;
 	Files_Buffer buf = NIL;
@@ -722,14 +722,14 @@ void Files_WriteBytes (Files_Rider *r, ADDRESS *r__typ, SYSTEM_BYTE *x, LONGINT
 	(*r).res = 0;
 }
 
-void Files_Delete (CHAR *name, LONGINT name__len, INT16 *res)
+void Files_Delete (CHAR *name, ADDRESS name__len, INT16 *res)
 {
 	__DUP(name, name__len, CHAR);
 	*res = Platform_Unlink((void*)name, name__len);
 	__DEL(name);
 }
 
-void Files_Rename (CHAR *old, LONGINT old__len, CHAR *new, LONGINT new__len, INT16 *res)
+void Files_Rename (CHAR *old, ADDRESS old__len, CHAR *new, ADDRESS new__len, INT16 *res)
 {
 	INT32 fdold, fdnew, n;
 	INT16 error, ignore;
@@ -812,14 +812,14 @@ void Files_Register (Files_File f)
 	}
 }
 
-void Files_ChangeDirectory (CHAR *path, LONGINT path__len, INT16 *res)
+void Files_ChangeDirectory (CHAR *path, ADDRESS path__len, INT16 *res)
 {
 	__DUP(path, path__len, CHAR);
 	*res = Platform_Chdir((void*)path, path__len);
 	__DEL(path);
 }
 
-static void Files_FlipBytes (SYSTEM_BYTE *src, LONGINT src__len, SYSTEM_BYTE *dest, LONGINT dest__len)
+static void Files_FlipBytes (SYSTEM_BYTE *src, ADDRESS src__len, SYSTEM_BYTE *dest, ADDRESS dest__len)
 {
 	INT32 i, j;
 	if (!Platform_LittleEndian) {
@@ -877,7 +877,7 @@ void Files_ReadLReal (Files_Rider *R, ADDRESS *R__typ, LONGREAL *x)
 	Files_FlipBytes((void*)b, 8, (void*)&*x, 8);
 }
 
-void Files_ReadString (Files_Rider *R, ADDRESS *R__typ, CHAR *x, LONGINT x__len)
+void Files_ReadString (Files_Rider *R, ADDRESS *R__typ, CHAR *x, ADDRESS x__len)
 {
 	INT16 i;
 	CHAR ch;
@@ -889,7 +889,7 @@ void Files_ReadString (Files_Rider *R, ADDRESS *R__typ, CHAR *x, LONGINT x__len)
 	} while (!(ch == 0x00));
 }
 
-void Files_ReadLine (Files_Rider *R, ADDRESS *R__typ, CHAR *x, LONGINT x__len)
+void Files_ReadLine (Files_Rider *R, ADDRESS *R__typ, CHAR *x, ADDRESS x__len)
 {
 	INT16 i;
 	i = 0;
@@ -906,7 +906,7 @@ void Files_ReadLine (Files_Rider *R, ADDRESS *R__typ, CHAR *x, LONGINT x__len)
 	x[i] = 0x00;
 }
 
-void Files_ReadNum (Files_Rider *R, ADDRESS *R__typ, SYSTEM_BYTE *x, LONGINT x__len)
+void Files_ReadNum (Files_Rider *R, ADDRESS *R__typ, SYSTEM_BYTE *x, ADDRESS x__len)
 {
 	INT8 s, b;
 	INT64 q;
@@ -972,7 +972,7 @@ void Files_WriteLReal (Files_Rider *R, ADDRESS *R__typ, LONGREAL x)
 	Files_WriteBytes(&*R, R__typ, (void*)b, 8, 8);
 }
 
-void Files_WriteString (Files_Rider *R, ADDRESS *R__typ, CHAR *x, LONGINT x__len)
+void Files_WriteString (Files_Rider *R, ADDRESS *R__typ, CHAR *x, ADDRESS x__len)
 {
 	INT16 i;
 	i = 0;
@@ -991,7 +991,7 @@ void Files_WriteNum (Files_Rider *R, ADDRESS *R__typ, INT64 x)
 	Files_Write(&*R, R__typ, (CHAR)__MASK(x, -128));
 }
 
-void Files_GetName (Files_File f, CHAR *name, LONGINT name__len)
+void Files_GetName (Files_File f, CHAR *name, ADDRESS name__len)
 {
 	__COPY(f->workName, name, name__len);
 }
@@ -1009,7 +1009,7 @@ static void Files_Finalize (SYSTEM_PTR o)
 	}
 }
 
-void Files_SetSearchPath (CHAR *path, LONGINT path__len)
+void Files_SetSearchPath (CHAR *path, ADDRESS path__len)
 {
 	__DUP(path, path__len, CHAR);
 	if (Strings_Length(path, path__len) != 0) {
diff --git a/bootstrap/unix-48/Files.h b/bootstrap/unix-48/Files.h
index 79164af5..1012ec46 100644
--- a/bootstrap/unix-48/Files.h
+++ b/bootstrap/unix-48/Files.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. tspaSF */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. tspaSF */
 
 #ifndef Files__h
 #define Files__h
@@ -28,41 +28,41 @@ import ADDRESS *Files_FileDesc__typ;
 import ADDRESS *Files_Rider__typ;
 
 import Files_File Files_Base (Files_Rider *r, ADDRESS *r__typ);
-import void Files_ChangeDirectory (CHAR *path, LONGINT path__len, INT16 *res);
+import void Files_ChangeDirectory (CHAR *path, ADDRESS path__len, INT16 *res);
 import void Files_Close (Files_File f);
-import void Files_Delete (CHAR *name, LONGINT name__len, INT16 *res);
+import void Files_Delete (CHAR *name, ADDRESS name__len, INT16 *res);
 import void Files_GetDate (Files_File f, INT32 *t, INT32 *d);
-import void Files_GetName (Files_File f, CHAR *name, LONGINT name__len);
+import void Files_GetName (Files_File f, CHAR *name, ADDRESS name__len);
 import INT32 Files_Length (Files_File f);
-import Files_File Files_New (CHAR *name, LONGINT name__len);
-import Files_File Files_Old (CHAR *name, LONGINT name__len);
+import Files_File Files_New (CHAR *name, ADDRESS name__len);
+import Files_File Files_Old (CHAR *name, ADDRESS name__len);
 import INT32 Files_Pos (Files_Rider *r, ADDRESS *r__typ);
 import void Files_Purge (Files_File f);
 import void Files_Read (Files_Rider *r, ADDRESS *r__typ, SYSTEM_BYTE *x);
 import void Files_ReadBool (Files_Rider *R, ADDRESS *R__typ, BOOLEAN *x);
-import void Files_ReadBytes (Files_Rider *r, ADDRESS *r__typ, SYSTEM_BYTE *x, LONGINT x__len, INT32 n);
+import void Files_ReadBytes (Files_Rider *r, ADDRESS *r__typ, SYSTEM_BYTE *x, ADDRESS x__len, INT32 n);
 import void Files_ReadInt (Files_Rider *R, ADDRESS *R__typ, INT16 *x);
 import void Files_ReadLInt (Files_Rider *R, ADDRESS *R__typ, INT32 *x);
 import void Files_ReadLReal (Files_Rider *R, ADDRESS *R__typ, LONGREAL *x);
-import void Files_ReadLine (Files_Rider *R, ADDRESS *R__typ, CHAR *x, LONGINT x__len);
-import void Files_ReadNum (Files_Rider *R, ADDRESS *R__typ, SYSTEM_BYTE *x, LONGINT x__len);
+import void Files_ReadLine (Files_Rider *R, ADDRESS *R__typ, CHAR *x, ADDRESS x__len);
+import void Files_ReadNum (Files_Rider *R, ADDRESS *R__typ, SYSTEM_BYTE *x, ADDRESS x__len);
 import void Files_ReadReal (Files_Rider *R, ADDRESS *R__typ, REAL *x);
 import void Files_ReadSet (Files_Rider *R, ADDRESS *R__typ, UINT32 *x);
-import void Files_ReadString (Files_Rider *R, ADDRESS *R__typ, CHAR *x, LONGINT x__len);
+import void Files_ReadString (Files_Rider *R, ADDRESS *R__typ, CHAR *x, ADDRESS x__len);
 import void Files_Register (Files_File f);
-import void Files_Rename (CHAR *old, LONGINT old__len, CHAR *new, LONGINT new__len, INT16 *res);
+import void Files_Rename (CHAR *old, ADDRESS old__len, CHAR *new, ADDRESS new__len, INT16 *res);
 import void Files_Set (Files_Rider *r, ADDRESS *r__typ, Files_File f, INT32 pos);
-import void Files_SetSearchPath (CHAR *path, LONGINT path__len);
+import void Files_SetSearchPath (CHAR *path, ADDRESS path__len);
 import void Files_Write (Files_Rider *r, ADDRESS *r__typ, SYSTEM_BYTE x);
 import void Files_WriteBool (Files_Rider *R, ADDRESS *R__typ, BOOLEAN x);
-import void Files_WriteBytes (Files_Rider *r, ADDRESS *r__typ, SYSTEM_BYTE *x, LONGINT x__len, INT32 n);
+import void Files_WriteBytes (Files_Rider *r, ADDRESS *r__typ, SYSTEM_BYTE *x, ADDRESS x__len, INT32 n);
 import void Files_WriteInt (Files_Rider *R, ADDRESS *R__typ, INT16 x);
 import void Files_WriteLInt (Files_Rider *R, ADDRESS *R__typ, INT32 x);
 import void Files_WriteLReal (Files_Rider *R, ADDRESS *R__typ, LONGREAL x);
 import void Files_WriteNum (Files_Rider *R, ADDRESS *R__typ, INT64 x);
 import void Files_WriteReal (Files_Rider *R, ADDRESS *R__typ, REAL x);
 import void Files_WriteSet (Files_Rider *R, ADDRESS *R__typ, UINT32 x);
-import void Files_WriteString (Files_Rider *R, ADDRESS *R__typ, CHAR *x, LONGINT x__len);
+import void Files_WriteString (Files_Rider *R, ADDRESS *R__typ, CHAR *x, ADDRESS x__len);
 import void *Files__init(void);
 
 
diff --git a/bootstrap/unix-48/Heap.c b/bootstrap/unix-48/Heap.c
index 72677604..ba769b74 100644
--- a/bootstrap/unix-48/Heap.c
+++ b/bootstrap/unix-48/Heap.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. tsSF */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. tsSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
@@ -85,14 +85,14 @@ static void Heap_ExtendHeap (INT32 blksz);
 export void Heap_FINALL (void);
 static void Heap_Finalize (void);
 export void Heap_GC (BOOLEAN markStack);
-static void Heap_HeapSort (INT32 n, INT32 *a, LONGINT a__len);
+static void Heap_HeapSort (INT32 n, INT32 *a, ADDRESS a__len);
 export void Heap_INCREF (Heap_Module m);
 export void Heap_InitHeap (void);
 export void Heap_Lock (void);
 static void Heap_Mark (INT32 q);
-static void Heap_MarkCandidates (INT32 n, INT32 *cand, LONGINT cand__len);
+static void Heap_MarkCandidates (INT32 n, INT32 *cand, ADDRESS cand__len);
 static void Heap_MarkP (SYSTEM_PTR p);
-static void Heap_MarkStack (INT32 n, INT32 *cand, LONGINT cand__len);
+static void Heap_MarkStack (INT32 n, INT32 *cand, ADDRESS cand__len);
 export SYSTEM_PTR Heap_NEWBLK (INT32 size);
 export SYSTEM_PTR Heap_NEWREC (INT32 tag);
 static INT32 Heap_NewChunk (INT32 blksz);
@@ -101,7 +101,7 @@ export SYSTEM_PTR Heap_REGMOD (Heap_ModuleName name, Heap_EnumProc enumPtrs);
 export void Heap_REGTYP (Heap_Module m, INT32 typ);
 export void Heap_RegisterFinalizer (SYSTEM_PTR obj, Heap_Finalizer finalize);
 static void Heap_Scan (void);
-static void Heap_Sift (INT32 l, INT32 r, INT32 *a, LONGINT a__len);
+static void Heap_Sift (INT32 l, INT32 r, INT32 *a, ADDRESS a__len);
 export void Heap_Unlock (void);
 
 extern void *Heap__init();
@@ -445,7 +445,7 @@ static void Heap_Scan (void)
 	}
 }
 
-static void Heap_Sift (INT32 l, INT32 r, INT32 *a, LONGINT a__len)
+static void Heap_Sift (INT32 l, INT32 r, INT32 *a, ADDRESS a__len)
 {
 	INT32 i, j, x;
 	j = l;
@@ -464,7 +464,7 @@ static void Heap_Sift (INT32 l, INT32 r, INT32 *a, LONGINT a__len)
 	a[i] = x;
 }
 
-static void Heap_HeapSort (INT32 n, INT32 *a, LONGINT a__len)
+static void Heap_HeapSort (INT32 n, INT32 *a, ADDRESS a__len)
 {
 	INT32 l, r, x;
 	l = __ASHR(n, 1);
@@ -482,7 +482,7 @@ static void Heap_HeapSort (INT32 n, INT32 *a, LONGINT a__len)
 	}
 }
 
-static void Heap_MarkCandidates (INT32 n, INT32 *cand, LONGINT cand__len)
+static void Heap_MarkCandidates (INT32 n, INT32 *cand, ADDRESS cand__len)
 {
 	INT32 chnk, adr, tag, next, lim, lim1, i, ptr, size;
 	chnk = Heap_heap;
@@ -571,7 +571,7 @@ void Heap_FINALL (void)
 	}
 }
 
-static void Heap_MarkStack (INT32 n, INT32 *cand, LONGINT cand__len)
+static void Heap_MarkStack (INT32 n, INT32 *cand, ADDRESS cand__len)
 {
 	SYSTEM_PTR frame;
 	INT32 inc, nofcand, sp, p, stack0;
diff --git a/bootstrap/unix-48/Heap.h b/bootstrap/unix-48/Heap.h
index 0aa0a18b..d200254d 100644
--- a/bootstrap/unix-48/Heap.h
+++ b/bootstrap/unix-48/Heap.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. tsSF */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. tsSF */
 
 #ifndef Heap__h
 #define Heap__h
diff --git a/bootstrap/unix-48/Modules.c b/bootstrap/unix-48/Modules.c
index a5e72ba3..27e4473c 100644
--- a/bootstrap/unix-48/Modules.c
+++ b/bootstrap/unix-48/Modules.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
@@ -47,21 +47,21 @@ export Modules_ModuleName Modules_imported, Modules_importing;
 export ADDRESS *Modules_ModuleDesc__typ;
 export ADDRESS *Modules_CmdDesc__typ;
 
-static void Modules_Append (CHAR *a, LONGINT a__len, CHAR *b, LONGINT b__len);
+static void Modules_Append (CHAR *a, ADDRESS a__len, CHAR *b, ADDRESS b__len);
 export void Modules_AssertFail (INT32 code);
 static void Modules_DisplayHaltCode (INT32 code);
-export void Modules_Free (CHAR *name, LONGINT name__len, BOOLEAN all);
+export void Modules_Free (CHAR *name, ADDRESS name__len, BOOLEAN all);
 export void Modules_Halt (INT32 code);
-export Modules_Command Modules_ThisCommand (Modules_Module mod, CHAR *name, LONGINT name__len);
-export Modules_Module Modules_ThisMod (CHAR *name, LONGINT name__len);
+export Modules_Command Modules_ThisCommand (Modules_Module mod, CHAR *name, ADDRESS name__len);
+export Modules_Module Modules_ThisMod (CHAR *name, ADDRESS name__len);
 static void Modules_errch (CHAR c);
 static void Modules_errint (INT32 l);
-static void Modules_errstring (CHAR *s, LONGINT s__len);
+static void Modules_errstring (CHAR *s, ADDRESS s__len);
 
 #define Modules_modules()	(Modules_Module)Heap_modules
 #define Modules_setmodules(m)	Heap_modules = m
 
-static void Modules_Append (CHAR *a, LONGINT a__len, CHAR *b, LONGINT b__len)
+static void Modules_Append (CHAR *a, ADDRESS a__len, CHAR *b, ADDRESS b__len)
 {
 	INT16 i, j;
 	__DUP(b, b__len, CHAR);
@@ -79,7 +79,7 @@ static void Modules_Append (CHAR *a, LONGINT a__len, CHAR *b, LONGINT b__len)
 	__DEL(b);
 }
 
-Modules_Module Modules_ThisMod (CHAR *name, LONGINT name__len)
+Modules_Module Modules_ThisMod (CHAR *name, ADDRESS name__len)
 {
 	Modules_Module m = NIL;
 	CHAR bodyname[64];
@@ -103,7 +103,7 @@ Modules_Module Modules_ThisMod (CHAR *name, LONGINT name__len)
 	return m;
 }
 
-Modules_Command Modules_ThisCommand (Modules_Module mod, CHAR *name, LONGINT name__len)
+Modules_Command Modules_ThisCommand (Modules_Module mod, CHAR *name, ADDRESS name__len)
 {
 	Modules_Cmd c = NIL;
 	__DUP(name, name__len, CHAR);
@@ -130,7 +130,7 @@ Modules_Command Modules_ThisCommand (Modules_Module mod, CHAR *name, LONGINT nam
 	__RETCHK;
 }
 
-void Modules_Free (CHAR *name, LONGINT name__len, BOOLEAN all)
+void Modules_Free (CHAR *name, ADDRESS name__len, BOOLEAN all)
 {
 	Modules_Module m = NIL, p = NIL;
 	__DUP(name, name__len, CHAR);
@@ -168,7 +168,7 @@ static void Modules_errch (CHAR c)
 	e = Platform_Write(1, (ADDRESS)&c, 1);
 }
 
-static void Modules_errstring (CHAR *s, LONGINT s__len)
+static void Modules_errstring (CHAR *s, ADDRESS s__len)
 {
 	INT32 i;
 	__DUP(s, s__len, CHAR);
diff --git a/bootstrap/unix-48/Modules.h b/bootstrap/unix-48/Modules.h
index 8bb89fe5..b1f2385e 100644
--- a/bootstrap/unix-48/Modules.h
+++ b/bootstrap/unix-48/Modules.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef Modules__h
 #define Modules__h
@@ -44,10 +44,10 @@ import ADDRESS *Modules_ModuleDesc__typ;
 import ADDRESS *Modules_CmdDesc__typ;
 
 import void Modules_AssertFail (INT32 code);
-import void Modules_Free (CHAR *name, LONGINT name__len, BOOLEAN all);
+import void Modules_Free (CHAR *name, ADDRESS name__len, BOOLEAN all);
 import void Modules_Halt (INT32 code);
-import Modules_Command Modules_ThisCommand (Modules_Module mod, CHAR *name, LONGINT name__len);
-import Modules_Module Modules_ThisMod (CHAR *name, LONGINT name__len);
+import Modules_Command Modules_ThisCommand (Modules_Module mod, CHAR *name, ADDRESS name__len);
+import Modules_Module Modules_ThisMod (CHAR *name, ADDRESS name__len);
 import void *Modules__init(void);
 
 
diff --git a/bootstrap/unix-48/OPB.c b/bootstrap/unix-48/OPB.c
index 3ef8e2f9..bc44b83a 100644
--- a/bootstrap/unix-48/OPB.c
+++ b/bootstrap/unix-48/OPB.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/unix-48/OPB.h b/bootstrap/unix-48/OPB.h
index 0be714e8..eb93787e 100644
--- a/bootstrap/unix-48/OPB.h
+++ b/bootstrap/unix-48/OPB.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef OPB__h
 #define OPB__h
diff --git a/bootstrap/unix-48/OPC.c b/bootstrap/unix-48/OPC.c
index ef4b429f..72e0feef 100644
--- a/bootstrap/unix-48/OPC.c
+++ b/bootstrap/unix-48/OPC.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
@@ -56,7 +56,7 @@ static void OPC_GenHeaderMsg (void);
 export void OPC_Halt (INT32 n);
 export void OPC_Ident (OPT_Object obj);
 static void OPC_IdentList (OPT_Object obj, INT16 vis);
-static void OPC_Include (CHAR *name, LONGINT name__len);
+static void OPC_Include (CHAR *name, ADDRESS name__len);
 static void OPC_IncludeImports (OPT_Object obj, INT16 vis);
 export void OPC_Increment (BOOLEAN decrement);
 export void OPC_Indent (INT16 count);
@@ -68,11 +68,11 @@ static void OPC_InitTProcs (OPT_Object typ, OPT_Object obj);
 export void OPC_IntLiteral (INT64 n, INT32 size);
 export void OPC_Len (OPT_Object obj, OPT_Struct array, INT64 dim);
 static void OPC_LenList (OPT_Object par, BOOLEAN ansiDefine, BOOLEAN showParamName);
-static INT16 OPC_Length (CHAR *s, LONGINT s__len);
+static INT16 OPC_Length (CHAR *s, ADDRESS s__len);
 export BOOLEAN OPC_NeedsRetval (OPT_Object proc);
 export INT32 OPC_NofPtrs (OPT_Struct typ);
-static INT16 OPC_PerfectHash (CHAR *s, LONGINT s__len);
-static BOOLEAN OPC_Prefixed (OPT_ConstExt x, CHAR *y, LONGINT y__len);
+static INT16 OPC_PerfectHash (CHAR *s, ADDRESS s__len);
+static BOOLEAN OPC_Prefixed (OPT_ConstExt x, CHAR *y, ADDRESS y__len);
 static void OPC_ProcHeader (OPT_Object proc, BOOLEAN define);
 static void OPC_ProcPredefs (OPT_Object obj, INT8 vis);
 static void OPC_PutBase (OPT_Struct typ);
@@ -80,8 +80,8 @@ static void OPC_PutPtrOffsets (OPT_Struct typ, INT32 adr, INT32 *cnt);
 static void OPC_RegCmds (OPT_Object obj);
 export void OPC_SetInclude (BOOLEAN exclude);
 static void OPC_Stars (OPT_Struct typ, BOOLEAN *openClause);
-static void OPC_Str1 (CHAR *s, LONGINT s__len, INT32 x);
-static void OPC_StringLiteral (CHAR *s, LONGINT s__len, INT32 l);
+static void OPC_Str1 (CHAR *s, ADDRESS s__len, INT32 x);
+static void OPC_StringLiteral (CHAR *s, ADDRESS s__len, INT32 l);
 export void OPC_TDescDecl (OPT_Struct typ);
 export void OPC_TypeDefs (OPT_Object obj, INT16 vis);
 export void OPC_TypeOf (OPT_Object ap);
@@ -137,7 +137,7 @@ void OPC_EndBlk0 (void)
 	OPM_Write('}');
 }
 
-static void OPC_Str1 (CHAR *s, LONGINT s__len, INT32 x)
+static void OPC_Str1 (CHAR *s, ADDRESS s__len, INT32 x)
 {
 	CHAR ch;
 	INT16 i;
@@ -156,7 +156,7 @@ static void OPC_Str1 (CHAR *s, LONGINT s__len, INT32 x)
 	__DEL(s);
 }
 
-static INT16 OPC_Length (CHAR *s, LONGINT s__len)
+static INT16 OPC_Length (CHAR *s, ADDRESS s__len)
 {
 	INT16 i;
 	i = 0;
@@ -166,7 +166,7 @@ static INT16 OPC_Length (CHAR *s, LONGINT s__len)
 	return i;
 }
 
-static INT16 OPC_PerfectHash (CHAR *s, LONGINT s__len)
+static INT16 OPC_PerfectHash (CHAR *s, ADDRESS s__len)
 {
 	INT16 i, h;
 	i = 0;
@@ -364,7 +364,7 @@ static void OPC_DeclareBase (OPT_Object dcl)
 		OPM_WriteString((CHAR*)"struct ", 8);
 		OPC_BegBlk();
 		OPC_BegStat();
-		OPC_Str1((CHAR*)"LONGINT len[#]", 15, nofdims);
+		OPC_Str1((CHAR*)"ADDRESS len[#]", 15, nofdims);
 		OPC_EndStat();
 		OPC_BegStat();
 		__NEW(obj, OPT_ObjDesc);
@@ -511,7 +511,7 @@ static void OPC_LenList (OPT_Object par, BOOLEAN ansiDefine, BOOLEAN showParamNa
 	typ = par->typ->BaseTyp;
 	while (typ->comp == 3) {
 		if (ansiDefine) {
-			OPM_WriteString((CHAR*)", LONGINT ", 11);
+			OPM_WriteString((CHAR*)", ADDRESS ", 11);
 		} else {
 			OPM_WriteString((CHAR*)", ", 3);
 		}
@@ -720,7 +720,7 @@ static void OPC_DefineType (OPT_Struct str)
 	}
 }
 
-static BOOLEAN OPC_Prefixed (OPT_ConstExt x, CHAR *y, LONGINT y__len)
+static BOOLEAN OPC_Prefixed (OPT_ConstExt x, CHAR *y, ADDRESS y__len)
 {
 	INT16 i;
 	__DUP(y, y__len, CHAR);
@@ -969,7 +969,7 @@ static void OPC_IdentList (OPT_Object obj, INT16 vis)
 				OPC_EndStat();
 				OPC_BegStat();
 				base = OPT_linttyp;
-				OPM_WriteString((CHAR*)"LONGINT ", 9);
+				OPM_WriteString((CHAR*)"ADDRESS ", 9);
 				OPC_LenList(obj, 0, 1);
 			} else if ((obj->mode == 2 && obj->typ->comp == 4)) {
 				OPC_EndStat();
@@ -1008,7 +1008,7 @@ static void OPC_AnsiParamList (OPT_Object obj, BOOLEAN showParamNames)
 				__COPY(name, obj->name, 256);
 			}
 			if (obj->typ->comp == 3) {
-				OPM_WriteString((CHAR*)", LONGINT ", 11);
+				OPM_WriteString((CHAR*)", ADDRESS ", 11);
 				OPC_LenList(obj, 1, showParamNames);
 			} else if ((obj->mode == 2 && obj->typ->comp == 4)) {
 				OPM_WriteString((CHAR*)", ADDRESS *", 12);
@@ -1062,7 +1062,7 @@ static void OPC_ProcPredefs (OPT_Object obj, INT8 vis)
 	}
 }
 
-static void OPC_Include (CHAR *name, LONGINT name__len)
+static void OPC_Include (CHAR *name, ADDRESS name__len)
 {
 	__DUP(name, name__len, CHAR);
 	OPM_WriteString((CHAR*)"#include ", 10);
@@ -1744,7 +1744,7 @@ static void OPC_CharacterLiteral (INT64 c)
 	}
 }
 
-static void OPC_StringLiteral (CHAR *s, LONGINT s__len, INT32 l)
+static void OPC_StringLiteral (CHAR *s, ADDRESS s__len, INT32 l)
 {
 	INT32 i;
 	INT16 c;
@@ -1912,9 +1912,9 @@ static struct InitKeywords__46 {
 	struct InitKeywords__46 *lnk;
 } *InitKeywords__46_s;
 
-static void Enter__47 (CHAR *s, LONGINT s__len);
+static void Enter__47 (CHAR *s, ADDRESS s__len);
 
-static void Enter__47 (CHAR *s, LONGINT s__len)
+static void Enter__47 (CHAR *s, ADDRESS s__len)
 {
 	INT16 h;
 	__DUP(s, s__len, CHAR);
diff --git a/bootstrap/unix-48/OPC.h b/bootstrap/unix-48/OPC.h
index 842e7dec..5624314d 100644
--- a/bootstrap/unix-48/OPC.h
+++ b/bootstrap/unix-48/OPC.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef OPC__h
 #define OPC__h
diff --git a/bootstrap/unix-48/OPM.c b/bootstrap/unix-48/OPM.c
index e76d763e..632b78e5 100644
--- a/bootstrap/unix-48/OPM.c
+++ b/bootstrap/unix-48/OPM.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
@@ -53,26 +53,26 @@ export void OPM_FPrintLReal (INT32 *fp, LONGREAL val);
 export void OPM_FPrintReal (INT32 *fp, REAL val);
 export void OPM_FPrintSet (INT32 *fp, UINT64 val);
 static void OPM_FindLine (Files_File f, Files_Rider *r, ADDRESS *r__typ, INT64 pos);
-static void OPM_FingerprintBytes (INT32 *fp, SYSTEM_BYTE *bytes, LONGINT bytes__len);
+static void OPM_FingerprintBytes (INT32 *fp, SYSTEM_BYTE *bytes, ADDRESS bytes__len);
 export void OPM_Get (CHAR *ch);
-export void OPM_Init (BOOLEAN *done, CHAR *mname, LONGINT mname__len);
+export void OPM_Init (BOOLEAN *done, CHAR *mname, ADDRESS mname__len);
 export void OPM_InitOptions (void);
 export INT16 OPM_Integer (INT64 n);
 static void OPM_LogErrMsg (INT16 n);
-export void OPM_LogVT100 (CHAR *vt100code, LONGINT vt100code__len);
+export void OPM_LogVT100 (CHAR *vt100code, ADDRESS vt100code__len);
 export void OPM_LogW (CHAR ch);
 export void OPM_LogWLn (void);
 export void OPM_LogWNum (INT64 i, INT64 len);
-export void OPM_LogWStr (CHAR *s, LONGINT s__len);
+export void OPM_LogWStr (CHAR *s, ADDRESS s__len);
 export INT32 OPM_Longint (INT64 n);
-static void OPM_MakeFileName (CHAR *name, LONGINT name__len, CHAR *FName, LONGINT FName__len, CHAR *ext, LONGINT ext__len);
+static void OPM_MakeFileName (CHAR *name, ADDRESS name__len, CHAR *FName, ADDRESS FName__len, CHAR *ext, ADDRESS ext__len);
 export void OPM_Mark (INT16 n, INT32 pos);
-export void OPM_NewSym (CHAR *modName, LONGINT modName__len);
-export void OPM_OldSym (CHAR *modName, LONGINT modName__len, BOOLEAN *done);
-export void OPM_OpenFiles (CHAR *moduleName, LONGINT moduleName__len);
+export void OPM_NewSym (CHAR *modName, ADDRESS modName__len);
+export void OPM_OldSym (CHAR *modName, ADDRESS modName__len, BOOLEAN *done);
+export void OPM_OpenFiles (CHAR *moduleName, ADDRESS moduleName__len);
 export BOOLEAN OPM_OpenPar (void);
 export void OPM_RegisterNewSym (void);
-static void OPM_ScanOptions (CHAR *s, LONGINT s__len);
+static void OPM_ScanOptions (CHAR *s, ADDRESS s__len);
 static void OPM_ShowLine (INT64 pos);
 export INT64 OPM_SignedMaximum (INT32 bytecount);
 export INT64 OPM_SignedMinimum (INT32 bytecount);
@@ -93,8 +93,8 @@ export void OPM_WriteHex (INT64 i);
 export void OPM_WriteInt (INT64 i);
 export void OPM_WriteLn (void);
 export void OPM_WriteReal (LONGREAL r, CHAR suffx);
-export void OPM_WriteString (CHAR *s, LONGINT s__len);
-export void OPM_WriteStringVar (CHAR *s, LONGINT s__len);
+export void OPM_WriteString (CHAR *s, ADDRESS s__len);
+export void OPM_WriteStringVar (CHAR *s, ADDRESS s__len);
 export BOOLEAN OPM_eofSF (void);
 export void OPM_err (INT16 n);
 
@@ -105,7 +105,7 @@ void OPM_LogW (CHAR ch)
 	Out_Char(ch);
 }
 
-void OPM_LogWStr (CHAR *s, LONGINT s__len)
+void OPM_LogWStr (CHAR *s, ADDRESS s__len)
 {
 	__DUP(s, s__len, CHAR);
 	Out_String(s, s__len);
@@ -122,7 +122,7 @@ void OPM_LogWLn (void)
 	Out_Ln();
 }
 
-void OPM_LogVT100 (CHAR *vt100code, LONGINT vt100code__len)
+void OPM_LogVT100 (CHAR *vt100code, ADDRESS vt100code__len)
 {
 	__DUP(vt100code, vt100code__len, CHAR);
 	if ((Out_IsConsole && !__IN(16, OPM_Options, 32))) {
@@ -154,7 +154,7 @@ INT16 OPM_Integer (INT64 n)
 	return __VAL(INT16, n);
 }
 
-static void OPM_ScanOptions (CHAR *s, LONGINT s__len)
+static void OPM_ScanOptions (CHAR *s, ADDRESS s__len)
 {
 	INT16 i;
 	__DUP(s, s__len, CHAR);
@@ -465,7 +465,7 @@ void OPM_InitOptions (void)
 	Files_SetSearchPath(searchpath, 1024);
 }
 
-void OPM_Init (BOOLEAN *done, CHAR *mname, LONGINT mname__len)
+void OPM_Init (BOOLEAN *done, CHAR *mname, ADDRESS mname__len)
 {
 	Texts_Text T = NIL;
 	INT32 beg, end, time;
@@ -514,7 +514,7 @@ void OPM_Get (CHAR *ch)
 	}
 }
 
-static void OPM_MakeFileName (CHAR *name, LONGINT name__len, CHAR *FName, LONGINT FName__len, CHAR *ext, LONGINT ext__len)
+static void OPM_MakeFileName (CHAR *name, ADDRESS name__len, CHAR *FName, ADDRESS FName__len, CHAR *ext, ADDRESS ext__len)
 {
 	INT16 i, j;
 	CHAR ch;
@@ -700,7 +700,7 @@ void OPM_err (INT16 n)
 	OPM_Mark(n, OPM_errpos);
 }
 
-static void OPM_FingerprintBytes (INT32 *fp, SYSTEM_BYTE *bytes, LONGINT bytes__len)
+static void OPM_FingerprintBytes (INT32 *fp, SYSTEM_BYTE *bytes, ADDRESS bytes__len)
 {
 	INT16 i;
 	INT32 l;
@@ -772,7 +772,7 @@ void OPM_CloseOldSym (void)
 	Files_Close(Files_Base(&OPM_oldSF, Files_Rider__typ));
 }
 
-void OPM_OldSym (CHAR *modName, LONGINT modName__len, BOOLEAN *done)
+void OPM_OldSym (CHAR *modName, ADDRESS modName__len, BOOLEAN *done)
 {
 	CHAR tag, ver;
 	OPM_FileName fileName;
@@ -832,7 +832,7 @@ void OPM_DeleteNewSym (void)
 {
 }
 
-void OPM_NewSym (CHAR *modName, LONGINT modName__len)
+void OPM_NewSym (CHAR *modName, ADDRESS modName__len)
 {
 	OPM_FileName fileName;
 	OPM_MakeFileName((void*)modName, modName__len, (void*)fileName, 32, (CHAR*)".sym", 5);
@@ -851,7 +851,7 @@ void OPM_Write (CHAR ch)
 	Files_Write(&OPM_R[__X(OPM_currFile, 3)], Files_Rider__typ, ch);
 }
 
-void OPM_WriteString (CHAR *s, LONGINT s__len)
+void OPM_WriteString (CHAR *s, ADDRESS s__len)
 {
 	INT16 i;
 	i = 0;
@@ -861,7 +861,7 @@ void OPM_WriteString (CHAR *s, LONGINT s__len)
 	Files_WriteBytes(&OPM_R[__X(OPM_currFile, 3)], Files_Rider__typ, (void*)s, s__len * 1, i);
 }
 
-void OPM_WriteStringVar (CHAR *s, LONGINT s__len)
+void OPM_WriteStringVar (CHAR *s, ADDRESS s__len)
 {
 	INT16 i;
 	i = 0;
@@ -986,7 +986,7 @@ static void OPM_Append (Files_Rider *R, ADDRESS *R__typ, Files_File F)
 	}
 }
 
-void OPM_OpenFiles (CHAR *moduleName, LONGINT moduleName__len)
+void OPM_OpenFiles (CHAR *moduleName, ADDRESS moduleName__len)
 {
 	CHAR FName[32];
 	__COPY(moduleName, OPM_modName, 32);
diff --git a/bootstrap/unix-48/OPM.h b/bootstrap/unix-48/OPM.h
index 2d272feb..c310c421 100644
--- a/bootstrap/unix-48/OPM.h
+++ b/bootstrap/unix-48/OPM.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef OPM__h
 #define OPM__h
@@ -28,19 +28,19 @@ import void OPM_FPrintLReal (INT32 *fp, LONGREAL val);
 import void OPM_FPrintReal (INT32 *fp, REAL val);
 import void OPM_FPrintSet (INT32 *fp, UINT64 val);
 import void OPM_Get (CHAR *ch);
-import void OPM_Init (BOOLEAN *done, CHAR *mname, LONGINT mname__len);
+import void OPM_Init (BOOLEAN *done, CHAR *mname, ADDRESS mname__len);
 import void OPM_InitOptions (void);
 import INT16 OPM_Integer (INT64 n);
-import void OPM_LogVT100 (CHAR *vt100code, LONGINT vt100code__len);
+import void OPM_LogVT100 (CHAR *vt100code, ADDRESS vt100code__len);
 import void OPM_LogW (CHAR ch);
 import void OPM_LogWLn (void);
 import void OPM_LogWNum (INT64 i, INT64 len);
-import void OPM_LogWStr (CHAR *s, LONGINT s__len);
+import void OPM_LogWStr (CHAR *s, ADDRESS s__len);
 import INT32 OPM_Longint (INT64 n);
 import void OPM_Mark (INT16 n, INT32 pos);
-import void OPM_NewSym (CHAR *modName, LONGINT modName__len);
-import void OPM_OldSym (CHAR *modName, LONGINT modName__len, BOOLEAN *done);
-import void OPM_OpenFiles (CHAR *moduleName, LONGINT moduleName__len);
+import void OPM_NewSym (CHAR *modName, ADDRESS modName__len);
+import void OPM_OldSym (CHAR *modName, ADDRESS modName__len, BOOLEAN *done);
+import void OPM_OpenFiles (CHAR *moduleName, ADDRESS moduleName__len);
 import BOOLEAN OPM_OpenPar (void);
 import void OPM_RegisterNewSym (void);
 import INT64 OPM_SignedMaximum (INT32 bytecount);
@@ -61,8 +61,8 @@ import void OPM_WriteHex (INT64 i);
 import void OPM_WriteInt (INT64 i);
 import void OPM_WriteLn (void);
 import void OPM_WriteReal (LONGREAL r, CHAR suffx);
-import void OPM_WriteString (CHAR *s, LONGINT s__len);
-import void OPM_WriteStringVar (CHAR *s, LONGINT s__len);
+import void OPM_WriteString (CHAR *s, ADDRESS s__len);
+import void OPM_WriteStringVar (CHAR *s, ADDRESS s__len);
 import BOOLEAN OPM_eofSF (void);
 import void OPM_err (INT16 n);
 import void *OPM__init(void);
diff --git a/bootstrap/unix-48/OPP.c b/bootstrap/unix-48/OPP.c
index 3f360d00..02fd6337 100644
--- a/bootstrap/unix-48/OPP.c
+++ b/bootstrap/unix-48/OPP.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/unix-48/OPP.h b/bootstrap/unix-48/OPP.h
index 5a71eb39..acb2df91 100644
--- a/bootstrap/unix-48/OPP.h
+++ b/bootstrap/unix-48/OPP.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef OPP__h
 #define OPP__h
diff --git a/bootstrap/unix-48/OPS.c b/bootstrap/unix-48/OPS.c
index 6ee700e5..7aedbbd6 100644
--- a/bootstrap/unix-48/OPS.c
+++ b/bootstrap/unix-48/OPS.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. tspaSF */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. tspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/unix-48/OPS.h b/bootstrap/unix-48/OPS.h
index 1f7a3e58..e49c222b 100644
--- a/bootstrap/unix-48/OPS.h
+++ b/bootstrap/unix-48/OPS.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. tspaSF */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. tspaSF */
 
 #ifndef OPS__h
 #define OPS__h
diff --git a/bootstrap/unix-48/OPT.c b/bootstrap/unix-48/OPT.c
index 75820a95..1eb85a06 100644
--- a/bootstrap/unix-48/OPT.c
+++ b/bootstrap/unix-48/OPT.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
@@ -120,7 +120,7 @@ static void OPT_EnterTyp (OPS_Name name, INT8 form, INT16 size, OPT_Struct *res)
 static void OPT_EnterTypeAlias (OPS_Name name, OPT_Object *res);
 export void OPT_Export (BOOLEAN *ext, BOOLEAN *new);
 export void OPT_FPrintErr (OPT_Object obj, INT16 errcode);
-static void OPT_FPrintName (INT32 *fp, CHAR *name, LONGINT name__len);
+static void OPT_FPrintName (INT32 *fp, CHAR *name, ADDRESS name__len);
 export void OPT_FPrintObj (OPT_Object obj);
 static void OPT_FPrintSign (INT32 *fp, OPT_Struct result, OPT_Object par);
 export void OPT_FPrintStr (OPT_Struct typ);
@@ -132,7 +132,7 @@ export void OPT_Import (OPS_Name aliasName, OPS_Name name, BOOLEAN *done);
 static void OPT_InConstant (INT32 f, OPT_Const conval);
 static OPT_Object OPT_InFld (void);
 static void OPT_InMod (INT8 *mno);
-static void OPT_InName (CHAR *name, LONGINT name__len);
+static void OPT_InName (CHAR *name, ADDRESS name__len);
 static OPT_Object OPT_InObj (INT8 mno);
 static void OPT_InSign (INT8 mno, OPT_Struct *res, OPT_Object *par);
 static void OPT_InStruct (OPT_Struct *typ);
@@ -155,7 +155,7 @@ static void OPT_OutConstant (OPT_Object obj);
 static void OPT_OutFlds (OPT_Object fld, INT32 adr, BOOLEAN visible);
 static void OPT_OutHdFld (OPT_Struct typ, OPT_Object fld, INT32 adr);
 static void OPT_OutMod (INT16 mno);
-static void OPT_OutName (CHAR *name, LONGINT name__len);
+static void OPT_OutName (CHAR *name, ADDRESS name__len);
 static void OPT_OutObj (OPT_Object obj);
 static void OPT_OutSign (OPT_Struct result, OPT_Object par);
 static void OPT_OutStr (OPT_Struct typ);
@@ -576,7 +576,7 @@ void OPT_Insert (OPS_Name name, OPT_Object *obj)
 	*obj = ob1;
 }
 
-static void OPT_FPrintName (INT32 *fp, CHAR *name, LONGINT name__len)
+static void OPT_FPrintName (INT32 *fp, CHAR *name, ADDRESS name__len)
 {
 	INT16 i;
 	CHAR ch;
@@ -957,7 +957,7 @@ void OPT_InsertImport (OPT_Object obj, OPT_Object *root, OPT_Object *old)
 	}
 }
 
-static void OPT_InName (CHAR *name, LONGINT name__len)
+static void OPT_InName (CHAR *name, ADDRESS name__len)
 {
 	INT16 i;
 	CHAR ch;
@@ -1483,7 +1483,7 @@ void OPT_Import (OPS_Name aliasName, OPS_Name name, BOOLEAN *done)
 	}
 }
 
-static void OPT_OutName (CHAR *name, LONGINT name__len)
+static void OPT_OutName (CHAR *name, ADDRESS name__len)
 {
 	INT16 i;
 	CHAR ch;
diff --git a/bootstrap/unix-48/OPT.h b/bootstrap/unix-48/OPT.h
index 90fcacf5..9d34cea9 100644
--- a/bootstrap/unix-48/OPT.h
+++ b/bootstrap/unix-48/OPT.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef OPT__h
 #define OPT__h
diff --git a/bootstrap/unix-48/OPV.c b/bootstrap/unix-48/OPV.c
index 5c21cb97..f6d42592 100644
--- a/bootstrap/unix-48/OPV.c
+++ b/bootstrap/unix-48/OPV.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/unix-48/OPV.h b/bootstrap/unix-48/OPV.h
index c4a61586..0f1980ac 100644
--- a/bootstrap/unix-48/OPV.h
+++ b/bootstrap/unix-48/OPV.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef OPV__h
 #define OPV__h
diff --git a/bootstrap/unix-48/Out.c b/bootstrap/unix-48/Out.c
index 39f383cf..82ad945b 100644
--- a/bootstrap/unix-48/Out.c
+++ b/bootstrap/unix-48/Out.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
@@ -17,16 +17,16 @@ static INT16 Out_in;
 export void Out_Char (CHAR ch);
 export void Out_Flush (void);
 export void Out_Int (INT64 x, INT64 n);
-static INT32 Out_Length (CHAR *s, LONGINT s__len);
+static INT32 Out_Length (CHAR *s, ADDRESS s__len);
 export void Out_Ln (void);
 export void Out_LongReal (LONGREAL x, INT16 n);
 export void Out_Open (void);
 export void Out_Real (REAL x, INT16 n);
 static void Out_RealP (LONGREAL x, INT16 n, BOOLEAN long_);
-export void Out_String (CHAR *str, LONGINT str__len);
+export void Out_String (CHAR *str, ADDRESS str__len);
 export LONGREAL Out_Ten (INT16 e);
-static void Out_digit (INT64 n, CHAR *s, LONGINT s__len, INT16 *i);
-static void Out_prepend (CHAR *t, LONGINT t__len, CHAR *s, LONGINT s__len, INT16 *i);
+static void Out_digit (INT64 n, CHAR *s, ADDRESS s__len, INT16 *i);
+static void Out_prepend (CHAR *t, ADDRESS t__len, CHAR *s, ADDRESS s__len, INT16 *i);
 
 #define Out_Entier64(x)	(INT64)(x)
 
@@ -55,7 +55,7 @@ void Out_Char (CHAR ch)
 	}
 }
 
-static INT32 Out_Length (CHAR *s, LONGINT s__len)
+static INT32 Out_Length (CHAR *s, ADDRESS s__len)
 {
 	INT32 l;
 	l = 0;
@@ -65,7 +65,7 @@ static INT32 Out_Length (CHAR *s, LONGINT s__len)
 	return l;
 }
 
-void Out_String (CHAR *str, LONGINT str__len)
+void Out_String (CHAR *str, ADDRESS str__len)
 {
 	INT32 l;
 	INT16 error;
@@ -125,13 +125,13 @@ void Out_Ln (void)
 	Out_Flush();
 }
 
-static void Out_digit (INT64 n, CHAR *s, LONGINT s__len, INT16 *i)
+static void Out_digit (INT64 n, CHAR *s, ADDRESS s__len, INT16 *i)
 {
 	*i -= 1;
 	s[__X(*i, s__len)] = (CHAR)(__MOD(n, 10) + 48);
 }
 
-static void Out_prepend (CHAR *t, LONGINT t__len, CHAR *s, LONGINT s__len, INT16 *i)
+static void Out_prepend (CHAR *t, ADDRESS t__len, CHAR *s, ADDRESS s__len, INT16 *i)
 {
 	INT16 j;
 	INT32 l;
diff --git a/bootstrap/unix-48/Out.h b/bootstrap/unix-48/Out.h
index 0e66420d..d58a17d5 100644
--- a/bootstrap/unix-48/Out.h
+++ b/bootstrap/unix-48/Out.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef Out__h
 #define Out__h
@@ -16,7 +16,7 @@ import void Out_Ln (void);
 import void Out_LongReal (LONGREAL x, INT16 n);
 import void Out_Open (void);
 import void Out_Real (REAL x, INT16 n);
-import void Out_String (CHAR *str, LONGINT str__len);
+import void Out_String (CHAR *str, ADDRESS str__len);
 import LONGREAL Out_Ten (INT16 e);
 import void *Out__init(void);
 
diff --git a/bootstrap/unix-48/Platform.c b/bootstrap/unix-48/Platform.c
index 72c15bf8..459d5079 100644
--- a/bootstrap/unix-48/Platform.c
+++ b/bootstrap/unix-48/Platform.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
@@ -45,35 +45,35 @@ export CHAR Platform_NL[3];
 export ADDRESS *Platform_FileIdentity__typ;
 
 export BOOLEAN Platform_Absent (INT16 e);
-export INT16 Platform_ArgPos (CHAR *s, LONGINT s__len);
-export INT16 Platform_Chdir (CHAR *n, LONGINT n__len);
+export INT16 Platform_ArgPos (CHAR *s, ADDRESS s__len);
+export INT16 Platform_Chdir (CHAR *n, ADDRESS n__len);
 export INT16 Platform_Close (INT32 h);
 export BOOLEAN Platform_ConnectionFailed (INT16 e);
 export void Platform_Delay (INT32 ms);
 export BOOLEAN Platform_DifferentFilesystems (INT16 e);
 export INT16 Platform_Error (void);
 export void Platform_Exit (INT32 code);
-export void Platform_GetArg (INT16 n, CHAR *val, LONGINT val__len);
+export void Platform_GetArg (INT16 n, CHAR *val, ADDRESS val__len);
 export void Platform_GetClock (INT32 *t, INT32 *d);
-export void Platform_GetEnv (CHAR *var, LONGINT var__len, CHAR *val, LONGINT val__len);
+export void Platform_GetEnv (CHAR *var, ADDRESS var__len, CHAR *val, ADDRESS val__len);
 export void Platform_GetIntArg (INT16 n, INT32 *val);
 export void Platform_GetTimeOfDay (INT32 *sec, INT32 *usec);
 export INT16 Platform_Identify (INT32 h, Platform_FileIdentity *identity, ADDRESS *identity__typ);
-export INT16 Platform_IdentifyByName (CHAR *n, LONGINT n__len, Platform_FileIdentity *identity, ADDRESS *identity__typ);
+export INT16 Platform_IdentifyByName (CHAR *n, ADDRESS n__len, Platform_FileIdentity *identity, ADDRESS *identity__typ);
 export BOOLEAN Platform_Inaccessible (INT16 e);
 export void Platform_Init (INT32 argc, INT32 argvadr);
 export BOOLEAN Platform_Interrupted (INT16 e);
 export BOOLEAN Platform_IsConsole (INT32 h);
 export void Platform_MTimeAsClock (Platform_FileIdentity i, INT32 *t, INT32 *d);
-export INT16 Platform_New (CHAR *n, LONGINT n__len, INT32 *h);
+export INT16 Platform_New (CHAR *n, ADDRESS n__len, INT32 *h);
 export BOOLEAN Platform_NoSuchDirectory (INT16 e);
 export INT32 Platform_OSAllocate (INT32 size);
 export void Platform_OSFree (INT32 address);
-export INT16 Platform_OldRO (CHAR *n, LONGINT n__len, INT32 *h);
-export INT16 Platform_OldRW (CHAR *n, LONGINT n__len, INT32 *h);
+export INT16 Platform_OldRO (CHAR *n, ADDRESS n__len, INT32 *h);
+export INT16 Platform_OldRW (CHAR *n, ADDRESS n__len, INT32 *h);
 export INT16 Platform_Read (INT32 h, INT32 p, INT32 l, INT32 *n);
-export INT16 Platform_ReadBuf (INT32 h, SYSTEM_BYTE *b, LONGINT b__len, INT32 *n);
-export INT16 Platform_Rename (CHAR *o, LONGINT o__len, CHAR *n, LONGINT n__len);
+export INT16 Platform_ReadBuf (INT32 h, SYSTEM_BYTE *b, ADDRESS b__len, INT32 *n);
+export INT16 Platform_Rename (CHAR *o, ADDRESS o__len, CHAR *n, ADDRESS n__len);
 export BOOLEAN Platform_SameFile (Platform_FileIdentity i1, Platform_FileIdentity i2);
 export BOOLEAN Platform_SameFileTime (Platform_FileIdentity i1, Platform_FileIdentity i2);
 export INT16 Platform_Seek (INT32 h, INT32 offset, INT16 whence);
@@ -83,16 +83,16 @@ export void Platform_SetMTime (Platform_FileIdentity *target, ADDRESS *target__t
 export void Platform_SetQuitHandler (Platform_SignalHandler handler);
 export INT16 Platform_Size (INT32 h, INT32 *l);
 export INT16 Platform_Sync (INT32 h);
-export INT16 Platform_System (CHAR *cmd, LONGINT cmd__len);
+export INT16 Platform_System (CHAR *cmd, ADDRESS cmd__len);
 static void Platform_TestLittleEndian (void);
 export INT32 Platform_Time (void);
 export BOOLEAN Platform_TimedOut (INT16 e);
 export BOOLEAN Platform_TooManyFiles (INT16 e);
 export INT16 Platform_Truncate (INT32 h, INT32 l);
-export INT16 Platform_Unlink (CHAR *n, LONGINT n__len);
+export INT16 Platform_Unlink (CHAR *n, ADDRESS n__len);
 export INT16 Platform_Write (INT32 h, INT32 p, INT32 l);
 static void Platform_YMDHMStoClock (INT32 ye, INT32 mo, INT32 da, INT32 ho, INT32 mi, INT32 se, INT32 *t, INT32 *d);
-export BOOLEAN Platform_getEnv (CHAR *var, LONGINT var__len, CHAR *val, LONGINT val__len);
+export BOOLEAN Platform_getEnv (CHAR *var, ADDRESS var__len, CHAR *val, ADDRESS val__len);
 
 #include <errno.h>
 #include <errno.h>
@@ -223,7 +223,7 @@ void Platform_Init (INT32 argc, INT32 argvadr)
 	Platform_HeapInitHeap();
 }
 
-BOOLEAN Platform_getEnv (CHAR *var, LONGINT var__len, CHAR *val, LONGINT val__len)
+BOOLEAN Platform_getEnv (CHAR *var, ADDRESS var__len, CHAR *val, ADDRESS val__len)
 {
 	Platform_EnvPtr p = NIL;
 	__DUP(var, var__len, CHAR);
@@ -235,7 +235,7 @@ BOOLEAN Platform_getEnv (CHAR *var, LONGINT var__len, CHAR *val, LONGINT val__le
 	return p != NIL;
 }
 
-void Platform_GetEnv (CHAR *var, LONGINT var__len, CHAR *val, LONGINT val__len)
+void Platform_GetEnv (CHAR *var, ADDRESS var__len, CHAR *val, ADDRESS val__len)
 {
 	__DUP(var, var__len, CHAR);
 	if (!Platform_getEnv(var, var__len, (void*)val, val__len)) {
@@ -244,7 +244,7 @@ void Platform_GetEnv (CHAR *var, LONGINT var__len, CHAR *val, LONGINT val__len)
 	__DEL(var);
 }
 
-void Platform_GetArg (INT16 n, CHAR *val, LONGINT val__len)
+void Platform_GetArg (INT16 n, CHAR *val, ADDRESS val__len)
 {
 	Platform_ArgVec av = NIL;
 	if (n < Platform_ArgCount) {
@@ -279,7 +279,7 @@ void Platform_GetIntArg (INT16 n, INT32 *val)
 	}
 }
 
-INT16 Platform_ArgPos (CHAR *s, LONGINT s__len)
+INT16 Platform_ArgPos (CHAR *s, ADDRESS s__len)
 {
 	INT16 i;
 	CHAR arg[256];
@@ -345,7 +345,7 @@ void Platform_Delay (INT32 ms)
 	Platform_nanosleep(s, ns);
 }
 
-INT16 Platform_System (CHAR *cmd, LONGINT cmd__len)
+INT16 Platform_System (CHAR *cmd, ADDRESS cmd__len)
 {
 	__DUP(cmd, cmd__len, CHAR);
 	__DEL(cmd);
@@ -357,7 +357,7 @@ INT16 Platform_Error (void)
 	return Platform_err();
 }
 
-INT16 Platform_OldRO (CHAR *n, LONGINT n__len, INT32 *h)
+INT16 Platform_OldRO (CHAR *n, ADDRESS n__len, INT32 *h)
 {
 	INT16 fd;
 	fd = Platform_openro(n, n__len);
@@ -370,7 +370,7 @@ INT16 Platform_OldRO (CHAR *n, LONGINT n__len, INT32 *h)
 	__RETCHK;
 }
 
-INT16 Platform_OldRW (CHAR *n, LONGINT n__len, INT32 *h)
+INT16 Platform_OldRW (CHAR *n, ADDRESS n__len, INT32 *h)
 {
 	INT16 fd;
 	fd = Platform_openrw(n, n__len);
@@ -383,7 +383,7 @@ INT16 Platform_OldRW (CHAR *n, LONGINT n__len, INT32 *h)
 	__RETCHK;
 }
 
-INT16 Platform_New (CHAR *n, LONGINT n__len, INT32 *h)
+INT16 Platform_New (CHAR *n, ADDRESS n__len, INT32 *h)
 {
 	INT16 fd;
 	fd = Platform_opennew(n, n__len);
@@ -423,7 +423,7 @@ INT16 Platform_Identify (INT32 h, Platform_FileIdentity *identity, ADDRESS *iden
 	return 0;
 }
 
-INT16 Platform_IdentifyByName (CHAR *n, LONGINT n__len, Platform_FileIdentity *identity, ADDRESS *identity__typ)
+INT16 Platform_IdentifyByName (CHAR *n, ADDRESS n__len, Platform_FileIdentity *identity, ADDRESS *identity__typ)
 {
 	__DUP(n, n__len, CHAR);
 	Platform_structstats();
@@ -481,7 +481,7 @@ INT16 Platform_Read (INT32 h, INT32 p, INT32 l, INT32 *n)
 	__RETCHK;
 }
 
-INT16 Platform_ReadBuf (INT32 h, SYSTEM_BYTE *b, LONGINT b__len, INT32 *n)
+INT16 Platform_ReadBuf (INT32 h, SYSTEM_BYTE *b, ADDRESS b__len, INT32 *n)
 {
 	*n = Platform_readfile(h, (ADDRESS)b, b__len);
 	if (*n < 0) {
@@ -535,7 +535,7 @@ INT16 Platform_Truncate (INT32 h, INT32 l)
 	__RETCHK;
 }
 
-INT16 Platform_Unlink (CHAR *n, LONGINT n__len)
+INT16 Platform_Unlink (CHAR *n, ADDRESS n__len)
 {
 	if (Platform_unlink(n, n__len) < 0) {
 		return Platform_err();
@@ -545,7 +545,7 @@ INT16 Platform_Unlink (CHAR *n, LONGINT n__len)
 	__RETCHK;
 }
 
-INT16 Platform_Chdir (CHAR *n, LONGINT n__len)
+INT16 Platform_Chdir (CHAR *n, ADDRESS n__len)
 {
 	INT16 r;
 	if ((Platform_chdir(n, n__len) >= 0 && Platform_getcwd((void*)Platform_CWD, 256) != NIL)) {
@@ -556,7 +556,7 @@ INT16 Platform_Chdir (CHAR *n, LONGINT n__len)
 	__RETCHK;
 }
 
-INT16 Platform_Rename (CHAR *o, LONGINT o__len, CHAR *n, LONGINT n__len)
+INT16 Platform_Rename (CHAR *o, ADDRESS o__len, CHAR *n, ADDRESS n__len)
 {
 	if (Platform_rename(o, o__len, n, n__len) < 0) {
 		return Platform_err();
diff --git a/bootstrap/unix-48/Platform.h b/bootstrap/unix-48/Platform.h
index b04f552d..34547692 100644
--- a/bootstrap/unix-48/Platform.h
+++ b/bootstrap/unix-48/Platform.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef Platform__h
 #define Platform__h
@@ -27,35 +27,35 @@ import CHAR Platform_NL[3];
 import ADDRESS *Platform_FileIdentity__typ;
 
 import BOOLEAN Platform_Absent (INT16 e);
-import INT16 Platform_ArgPos (CHAR *s, LONGINT s__len);
-import INT16 Platform_Chdir (CHAR *n, LONGINT n__len);
+import INT16 Platform_ArgPos (CHAR *s, ADDRESS s__len);
+import INT16 Platform_Chdir (CHAR *n, ADDRESS n__len);
 import INT16 Platform_Close (INT32 h);
 import BOOLEAN Platform_ConnectionFailed (INT16 e);
 import void Platform_Delay (INT32 ms);
 import BOOLEAN Platform_DifferentFilesystems (INT16 e);
 import INT16 Platform_Error (void);
 import void Platform_Exit (INT32 code);
-import void Platform_GetArg (INT16 n, CHAR *val, LONGINT val__len);
+import void Platform_GetArg (INT16 n, CHAR *val, ADDRESS val__len);
 import void Platform_GetClock (INT32 *t, INT32 *d);
-import void Platform_GetEnv (CHAR *var, LONGINT var__len, CHAR *val, LONGINT val__len);
+import void Platform_GetEnv (CHAR *var, ADDRESS var__len, CHAR *val, ADDRESS val__len);
 import void Platform_GetIntArg (INT16 n, INT32 *val);
 import void Platform_GetTimeOfDay (INT32 *sec, INT32 *usec);
 import INT16 Platform_Identify (INT32 h, Platform_FileIdentity *identity, ADDRESS *identity__typ);
-import INT16 Platform_IdentifyByName (CHAR *n, LONGINT n__len, Platform_FileIdentity *identity, ADDRESS *identity__typ);
+import INT16 Platform_IdentifyByName (CHAR *n, ADDRESS n__len, Platform_FileIdentity *identity, ADDRESS *identity__typ);
 import BOOLEAN Platform_Inaccessible (INT16 e);
 import void Platform_Init (INT32 argc, INT32 argvadr);
 import BOOLEAN Platform_Interrupted (INT16 e);
 import BOOLEAN Platform_IsConsole (INT32 h);
 import void Platform_MTimeAsClock (Platform_FileIdentity i, INT32 *t, INT32 *d);
-import INT16 Platform_New (CHAR *n, LONGINT n__len, INT32 *h);
+import INT16 Platform_New (CHAR *n, ADDRESS n__len, INT32 *h);
 import BOOLEAN Platform_NoSuchDirectory (INT16 e);
 import INT32 Platform_OSAllocate (INT32 size);
 import void Platform_OSFree (INT32 address);
-import INT16 Platform_OldRO (CHAR *n, LONGINT n__len, INT32 *h);
-import INT16 Platform_OldRW (CHAR *n, LONGINT n__len, INT32 *h);
+import INT16 Platform_OldRO (CHAR *n, ADDRESS n__len, INT32 *h);
+import INT16 Platform_OldRW (CHAR *n, ADDRESS n__len, INT32 *h);
 import INT16 Platform_Read (INT32 h, INT32 p, INT32 l, INT32 *n);
-import INT16 Platform_ReadBuf (INT32 h, SYSTEM_BYTE *b, LONGINT b__len, INT32 *n);
-import INT16 Platform_Rename (CHAR *o, LONGINT o__len, CHAR *n, LONGINT n__len);
+import INT16 Platform_ReadBuf (INT32 h, SYSTEM_BYTE *b, ADDRESS b__len, INT32 *n);
+import INT16 Platform_Rename (CHAR *o, ADDRESS o__len, CHAR *n, ADDRESS n__len);
 import BOOLEAN Platform_SameFile (Platform_FileIdentity i1, Platform_FileIdentity i2);
 import BOOLEAN Platform_SameFileTime (Platform_FileIdentity i1, Platform_FileIdentity i2);
 import INT16 Platform_Seek (INT32 h, INT32 offset, INT16 whence);
@@ -65,14 +65,14 @@ import void Platform_SetMTime (Platform_FileIdentity *target, ADDRESS *target__t
 import void Platform_SetQuitHandler (Platform_SignalHandler handler);
 import INT16 Platform_Size (INT32 h, INT32 *l);
 import INT16 Platform_Sync (INT32 h);
-import INT16 Platform_System (CHAR *cmd, LONGINT cmd__len);
+import INT16 Platform_System (CHAR *cmd, ADDRESS cmd__len);
 import INT32 Platform_Time (void);
 import BOOLEAN Platform_TimedOut (INT16 e);
 import BOOLEAN Platform_TooManyFiles (INT16 e);
 import INT16 Platform_Truncate (INT32 h, INT32 l);
-import INT16 Platform_Unlink (CHAR *n, LONGINT n__len);
+import INT16 Platform_Unlink (CHAR *n, ADDRESS n__len);
 import INT16 Platform_Write (INT32 h, INT32 p, INT32 l);
-import BOOLEAN Platform_getEnv (CHAR *var, LONGINT var__len, CHAR *val, LONGINT val__len);
+import BOOLEAN Platform_getEnv (CHAR *var, ADDRESS var__len, CHAR *val, ADDRESS val__len);
 import void *Platform__init(void);
 
 
diff --git a/bootstrap/unix-48/Reals.c b/bootstrap/unix-48/Reals.c
index cd4c3c61..be3ad909 100644
--- a/bootstrap/unix-48/Reals.c
+++ b/bootstrap/unix-48/Reals.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
@@ -10,11 +10,11 @@
 
 
 
-static void Reals_BytesToHex (SYSTEM_BYTE *b, LONGINT b__len, SYSTEM_BYTE *d, LONGINT d__len);
-export void Reals_Convert (REAL x, INT16 n, CHAR *d, LONGINT d__len);
-export void Reals_ConvertH (REAL y, CHAR *d, LONGINT d__len);
-export void Reals_ConvertHL (LONGREAL x, CHAR *d, LONGINT d__len);
-export void Reals_ConvertL (LONGREAL x, INT16 n, CHAR *d, LONGINT d__len);
+static void Reals_BytesToHex (SYSTEM_BYTE *b, ADDRESS b__len, SYSTEM_BYTE *d, ADDRESS d__len);
+export void Reals_Convert (REAL x, INT16 n, CHAR *d, ADDRESS d__len);
+export void Reals_ConvertH (REAL y, CHAR *d, ADDRESS d__len);
+export void Reals_ConvertHL (LONGREAL x, CHAR *d, ADDRESS d__len);
+export void Reals_ConvertL (LONGREAL x, INT16 n, CHAR *d, ADDRESS d__len);
 export INT16 Reals_Expo (REAL x);
 export INT16 Reals_ExpoL (LONGREAL x);
 export void Reals_SetExpo (REAL *x, INT16 ex);
@@ -79,7 +79,7 @@ INT16 Reals_ExpoL (LONGREAL x)
 	return __MASK(__ASHR(i, 4), -2048);
 }
 
-void Reals_ConvertL (LONGREAL x, INT16 n, CHAR *d, LONGINT d__len)
+void Reals_ConvertL (LONGREAL x, INT16 n, CHAR *d, ADDRESS d__len)
 {
 	INT32 i, j, k;
 	if (x < (LONGREAL)0) {
@@ -107,7 +107,7 @@ void Reals_ConvertL (LONGREAL x, INT16 n, CHAR *d, LONGINT d__len)
 	}
 }
 
-void Reals_Convert (REAL x, INT16 n, CHAR *d, LONGINT d__len)
+void Reals_Convert (REAL x, INT16 n, CHAR *d, ADDRESS d__len)
 {
 	Reals_ConvertL(x, n, (void*)d, d__len);
 }
@@ -122,7 +122,7 @@ static CHAR Reals_ToHex (INT16 i)
 	__RETCHK;
 }
 
-static void Reals_BytesToHex (SYSTEM_BYTE *b, LONGINT b__len, SYSTEM_BYTE *d, LONGINT d__len)
+static void Reals_BytesToHex (SYSTEM_BYTE *b, ADDRESS b__len, SYSTEM_BYTE *d, ADDRESS d__len)
 {
 	INT16 i;
 	INT32 l;
@@ -137,12 +137,12 @@ static void Reals_BytesToHex (SYSTEM_BYTE *b, LONGINT b__len, SYSTEM_BYTE *d, LO
 	}
 }
 
-void Reals_ConvertH (REAL y, CHAR *d, LONGINT d__len)
+void Reals_ConvertH (REAL y, CHAR *d, ADDRESS d__len)
 {
 	Reals_BytesToHex((void*)&y, 4, (void*)d, d__len * 1);
 }
 
-void Reals_ConvertHL (LONGREAL x, CHAR *d, LONGINT d__len)
+void Reals_ConvertHL (LONGREAL x, CHAR *d, ADDRESS d__len)
 {
 	Reals_BytesToHex((void*)&x, 8, (void*)d, d__len * 1);
 }
diff --git a/bootstrap/unix-48/Reals.h b/bootstrap/unix-48/Reals.h
index f0c84ab1..e8d15a2f 100644
--- a/bootstrap/unix-48/Reals.h
+++ b/bootstrap/unix-48/Reals.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef Reals__h
 #define Reals__h
@@ -8,10 +8,10 @@
 
 
 
-import void Reals_Convert (REAL x, INT16 n, CHAR *d, LONGINT d__len);
-import void Reals_ConvertH (REAL y, CHAR *d, LONGINT d__len);
-import void Reals_ConvertHL (LONGREAL x, CHAR *d, LONGINT d__len);
-import void Reals_ConvertL (LONGREAL x, INT16 n, CHAR *d, LONGINT d__len);
+import void Reals_Convert (REAL x, INT16 n, CHAR *d, ADDRESS d__len);
+import void Reals_ConvertH (REAL y, CHAR *d, ADDRESS d__len);
+import void Reals_ConvertHL (LONGREAL x, CHAR *d, ADDRESS d__len);
+import void Reals_ConvertL (LONGREAL x, INT16 n, CHAR *d, ADDRESS d__len);
 import INT16 Reals_Expo (REAL x);
 import INT16 Reals_ExpoL (LONGREAL x);
 import void Reals_SetExpo (REAL *x, INT16 ex);
diff --git a/bootstrap/unix-48/Strings.c b/bootstrap/unix-48/Strings.c
index b5707327..fd550df3 100644
--- a/bootstrap/unix-48/Strings.c
+++ b/bootstrap/unix-48/Strings.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
@@ -10,18 +10,18 @@
 
 
 
-export void Strings_Append (CHAR *extra, LONGINT extra__len, CHAR *dest, LONGINT dest__len);
-export void Strings_Cap (CHAR *s, LONGINT s__len);
-export void Strings_Delete (CHAR *s, LONGINT s__len, INT16 pos, INT16 n);
-export void Strings_Extract (CHAR *source, LONGINT source__len, INT16 pos, INT16 n, CHAR *dest, LONGINT dest__len);
-export void Strings_Insert (CHAR *source, LONGINT source__len, INT16 pos, CHAR *dest, LONGINT dest__len);
-export INT16 Strings_Length (CHAR *s, LONGINT s__len);
-export BOOLEAN Strings_Match (CHAR *string, LONGINT string__len, CHAR *pattern, LONGINT pattern__len);
-export INT16 Strings_Pos (CHAR *pattern, LONGINT pattern__len, CHAR *s, LONGINT s__len, INT16 pos);
-export void Strings_Replace (CHAR *source, LONGINT source__len, INT16 pos, CHAR *dest, LONGINT dest__len);
+export void Strings_Append (CHAR *extra, ADDRESS extra__len, CHAR *dest, ADDRESS dest__len);
+export void Strings_Cap (CHAR *s, ADDRESS s__len);
+export void Strings_Delete (CHAR *s, ADDRESS s__len, INT16 pos, INT16 n);
+export void Strings_Extract (CHAR *source, ADDRESS source__len, INT16 pos, INT16 n, CHAR *dest, ADDRESS dest__len);
+export void Strings_Insert (CHAR *source, ADDRESS source__len, INT16 pos, CHAR *dest, ADDRESS dest__len);
+export INT16 Strings_Length (CHAR *s, ADDRESS s__len);
+export BOOLEAN Strings_Match (CHAR *string, ADDRESS string__len, CHAR *pattern, ADDRESS pattern__len);
+export INT16 Strings_Pos (CHAR *pattern, ADDRESS pattern__len, CHAR *s, ADDRESS s__len, INT16 pos);
+export void Strings_Replace (CHAR *source, ADDRESS source__len, INT16 pos, CHAR *dest, ADDRESS dest__len);
 
 
-INT16 Strings_Length (CHAR *s, LONGINT s__len)
+INT16 Strings_Length (CHAR *s, ADDRESS s__len)
 {
 	INT32 i;
 	__DUP(s, s__len, CHAR);
@@ -39,7 +39,7 @@ INT16 Strings_Length (CHAR *s, LONGINT s__len)
 	__RETCHK;
 }
 
-void Strings_Append (CHAR *extra, LONGINT extra__len, CHAR *dest, LONGINT dest__len)
+void Strings_Append (CHAR *extra, ADDRESS extra__len, CHAR *dest, ADDRESS dest__len)
 {
 	INT16 n1, n2, i;
 	__DUP(extra, extra__len, CHAR);
@@ -56,7 +56,7 @@ void Strings_Append (CHAR *extra, LONGINT extra__len, CHAR *dest, LONGINT dest__
 	__DEL(extra);
 }
 
-void Strings_Insert (CHAR *source, LONGINT source__len, INT16 pos, CHAR *dest, LONGINT dest__len)
+void Strings_Insert (CHAR *source, ADDRESS source__len, INT16 pos, CHAR *dest, ADDRESS dest__len)
 {
 	INT16 n1, n2, i;
 	__DUP(source, source__len, CHAR);
@@ -87,7 +87,7 @@ void Strings_Insert (CHAR *source, LONGINT source__len, INT16 pos, CHAR *dest, L
 	__DEL(source);
 }
 
-void Strings_Delete (CHAR *s, LONGINT s__len, INT16 pos, INT16 n)
+void Strings_Delete (CHAR *s, ADDRESS s__len, INT16 pos, INT16 n)
 {
 	INT16 len, i;
 	len = Strings_Length(s, s__len);
@@ -110,7 +110,7 @@ void Strings_Delete (CHAR *s, LONGINT s__len, INT16 pos, INT16 n)
 	}
 }
 
-void Strings_Replace (CHAR *source, LONGINT source__len, INT16 pos, CHAR *dest, LONGINT dest__len)
+void Strings_Replace (CHAR *source, ADDRESS source__len, INT16 pos, CHAR *dest, ADDRESS dest__len)
 {
 	__DUP(source, source__len, CHAR);
 	Strings_Delete((void*)dest, dest__len, pos, pos + Strings_Length(source, source__len));
@@ -118,7 +118,7 @@ void Strings_Replace (CHAR *source, LONGINT source__len, INT16 pos, CHAR *dest,
 	__DEL(source);
 }
 
-void Strings_Extract (CHAR *source, LONGINT source__len, INT16 pos, INT16 n, CHAR *dest, LONGINT dest__len)
+void Strings_Extract (CHAR *source, ADDRESS source__len, INT16 pos, INT16 n, CHAR *dest, ADDRESS dest__len)
 {
 	INT16 len, destLen, i;
 	__DUP(source, source__len, CHAR);
@@ -143,7 +143,7 @@ void Strings_Extract (CHAR *source, LONGINT source__len, INT16 pos, INT16 n, CHA
 	__DEL(source);
 }
 
-INT16 Strings_Pos (CHAR *pattern, LONGINT pattern__len, CHAR *s, LONGINT s__len, INT16 pos)
+INT16 Strings_Pos (CHAR *pattern, ADDRESS pattern__len, CHAR *s, ADDRESS s__len, INT16 pos)
 {
 	INT16 n1, n2, i, j;
 	__DUP(pattern, pattern__len, CHAR);
@@ -175,7 +175,7 @@ INT16 Strings_Pos (CHAR *pattern, LONGINT pattern__len, CHAR *s, LONGINT s__len,
 	return -1;
 }
 
-void Strings_Cap (CHAR *s, LONGINT s__len)
+void Strings_Cap (CHAR *s, ADDRESS s__len)
 {
 	INT16 i;
 	i = 0;
@@ -191,9 +191,9 @@ static struct Match__7 {
 	struct Match__7 *lnk;
 } *Match__7_s;
 
-static BOOLEAN M__8 (CHAR *name, LONGINT name__len, CHAR *mask, LONGINT mask__len, INT16 n, INT16 m);
+static BOOLEAN M__8 (CHAR *name, ADDRESS name__len, CHAR *mask, ADDRESS mask__len, INT16 n, INT16 m);
 
-static BOOLEAN M__8 (CHAR *name, LONGINT name__len, CHAR *mask, LONGINT mask__len, INT16 n, INT16 m)
+static BOOLEAN M__8 (CHAR *name, ADDRESS name__len, CHAR *mask, ADDRESS mask__len, INT16 n, INT16 m)
 {
 	while ((((n >= 0 && m >= 0)) && mask[__X(m, mask__len)] != '*')) {
 		if (name[__X(n, name__len)] != mask[__X(m, mask__len)]) {
@@ -220,7 +220,7 @@ static BOOLEAN M__8 (CHAR *name, LONGINT name__len, CHAR *mask, LONGINT mask__le
 	return 0;
 }
 
-BOOLEAN Strings_Match (CHAR *string, LONGINT string__len, CHAR *pattern, LONGINT pattern__len)
+BOOLEAN Strings_Match (CHAR *string, ADDRESS string__len, CHAR *pattern, ADDRESS pattern__len)
 {
 	struct Match__7 _s;
 	BOOLEAN __retval;
diff --git a/bootstrap/unix-48/Strings.h b/bootstrap/unix-48/Strings.h
index c987af8d..76cb022d 100644
--- a/bootstrap/unix-48/Strings.h
+++ b/bootstrap/unix-48/Strings.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef Strings__h
 #define Strings__h
@@ -8,15 +8,15 @@
 
 
 
-import void Strings_Append (CHAR *extra, LONGINT extra__len, CHAR *dest, LONGINT dest__len);
-import void Strings_Cap (CHAR *s, LONGINT s__len);
-import void Strings_Delete (CHAR *s, LONGINT s__len, INT16 pos, INT16 n);
-import void Strings_Extract (CHAR *source, LONGINT source__len, INT16 pos, INT16 n, CHAR *dest, LONGINT dest__len);
-import void Strings_Insert (CHAR *source, LONGINT source__len, INT16 pos, CHAR *dest, LONGINT dest__len);
-import INT16 Strings_Length (CHAR *s, LONGINT s__len);
-import BOOLEAN Strings_Match (CHAR *string, LONGINT string__len, CHAR *pattern, LONGINT pattern__len);
-import INT16 Strings_Pos (CHAR *pattern, LONGINT pattern__len, CHAR *s, LONGINT s__len, INT16 pos);
-import void Strings_Replace (CHAR *source, LONGINT source__len, INT16 pos, CHAR *dest, LONGINT dest__len);
+import void Strings_Append (CHAR *extra, ADDRESS extra__len, CHAR *dest, ADDRESS dest__len);
+import void Strings_Cap (CHAR *s, ADDRESS s__len);
+import void Strings_Delete (CHAR *s, ADDRESS s__len, INT16 pos, INT16 n);
+import void Strings_Extract (CHAR *source, ADDRESS source__len, INT16 pos, INT16 n, CHAR *dest, ADDRESS dest__len);
+import void Strings_Insert (CHAR *source, ADDRESS source__len, INT16 pos, CHAR *dest, ADDRESS dest__len);
+import INT16 Strings_Length (CHAR *s, ADDRESS s__len);
+import BOOLEAN Strings_Match (CHAR *string, ADDRESS string__len, CHAR *pattern, ADDRESS pattern__len);
+import INT16 Strings_Pos (CHAR *pattern, ADDRESS pattern__len, CHAR *s, ADDRESS s__len, INT16 pos);
+import void Strings_Replace (CHAR *source, ADDRESS source__len, INT16 pos, CHAR *dest, ADDRESS dest__len);
 import void *Strings__init(void);
 
 
diff --git a/bootstrap/unix-48/Texts.c b/bootstrap/unix-48/Texts.c
index ad26b1cb..1428c051 100644
--- a/bootstrap/unix-48/Texts.c
+++ b/bootstrap/unix-48/Texts.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
@@ -187,20 +187,20 @@ export void Texts_Append (Texts_Text T, Texts_Buffer B);
 export void Texts_ChangeLooks (Texts_Text T, INT32 beg, INT32 end, UINT32 sel, Texts_FontsFont fnt, INT8 col, INT8 voff);
 static Texts_Elem Texts_CloneElem (Texts_Elem e);
 static Texts_Piece Texts_ClonePiece (Texts_Piece p);
-export void Texts_Close (Texts_Text T, CHAR *name, LONGINT name__len);
+export void Texts_Close (Texts_Text T, CHAR *name, ADDRESS name__len);
 export void Texts_Copy (Texts_Buffer SB, Texts_Buffer DB);
 export void Texts_CopyElem (Texts_Elem SE, Texts_Elem DE);
 export void Texts_Delete (Texts_Text T, INT32 beg, INT32 end);
 export Texts_Text Texts_ElemBase (Texts_Elem E);
 export INT32 Texts_ElemPos (Texts_Elem E);
 static void Texts_Find (Texts_Text T, INT32 *pos, Texts_Run *u, INT32 *org, INT32 *off);
-static Texts_FontsFont Texts_FontsThis (CHAR *name, LONGINT name__len);
+static Texts_FontsFont Texts_FontsThis (CHAR *name, ADDRESS name__len);
 static void Texts_HandleAlien (Texts_Elem E, Texts_ElemMsg *msg, ADDRESS *msg__typ);
 export void Texts_Insert (Texts_Text T, INT32 pos, Texts_Buffer B);
 export void Texts_Load (Files_Rider *r, ADDRESS *r__typ, Texts_Text T);
 static void Texts_Load0 (Files_Rider *r, ADDRESS *r__typ, Texts_Text T);
 static void Texts_Merge (Texts_Text T, Texts_Run u, Texts_Run *v);
-export void Texts_Open (Texts_Text T, CHAR *name, LONGINT name__len);
+export void Texts_Open (Texts_Text T, CHAR *name, ADDRESS name__len);
 export void Texts_OpenBuf (Texts_Buffer B);
 export void Texts_OpenReader (Texts_Reader *R, ADDRESS *R__typ, Texts_Text T, INT32 pos);
 export void Texts_OpenScanner (Texts_Scanner *S, ADDRESS *S__typ, Texts_Text T, INT32 pos);
@@ -229,10 +229,10 @@ export void Texts_WriteLongRealHex (Texts_Writer *W, ADDRESS *W__typ, LONGREAL x
 export void Texts_WriteReal (Texts_Writer *W, ADDRESS *W__typ, REAL x, INT16 n);
 export void Texts_WriteRealFix (Texts_Writer *W, ADDRESS *W__typ, REAL x, INT16 n, INT16 k);
 export void Texts_WriteRealHex (Texts_Writer *W, ADDRESS *W__typ, REAL x);
-export void Texts_WriteString (Texts_Writer *W, ADDRESS *W__typ, CHAR *s, LONGINT s__len);
+export void Texts_WriteString (Texts_Writer *W, ADDRESS *W__typ, CHAR *s, ADDRESS s__len);
 
 
-static Texts_FontsFont Texts_FontsThis (CHAR *name, LONGINT name__len)
+static Texts_FontsFont Texts_FontsThis (CHAR *name, ADDRESS name__len)
 {
 	Texts_FontsFont F = NIL;
 	__NEW(F, Texts_FontDesc);
@@ -1027,7 +1027,7 @@ void Texts_WriteLn (Texts_Writer *W, ADDRESS *W__typ)
 	Texts_Write(&*W, W__typ, 0x0d);
 }
 
-void Texts_WriteString (Texts_Writer *W, ADDRESS *W__typ, CHAR *s, LONGINT s__len)
+void Texts_WriteString (Texts_Writer *W, ADDRESS *W__typ, CHAR *s, ADDRESS s__len)
 {
 	INT16 i;
 	__DUP(s, s__len, CHAR);
@@ -1539,7 +1539,7 @@ void Texts_Load (Files_Rider *r, ADDRESS *r__typ, Texts_Text T)
 	Texts_Load0(&*r, r__typ, T);
 }
 
-void Texts_Open (Texts_Text T, CHAR *name, LONGINT name__len)
+void Texts_Open (Texts_Text T, CHAR *name, ADDRESS name__len)
 {
 	Files_File f = NIL;
 	Files_Rider r;
@@ -1755,7 +1755,7 @@ void Texts_Store (Files_Rider *r, ADDRESS *r__typ, Texts_Text T)
 	Store__39_s = _s.lnk;
 }
 
-void Texts_Close (Texts_Text T, CHAR *name, LONGINT name__len)
+void Texts_Close (Texts_Text T, CHAR *name, ADDRESS name__len)
 {
 	Files_File f = NIL;
 	Files_Rider r;
diff --git a/bootstrap/unix-48/Texts.h b/bootstrap/unix-48/Texts.h
index e2c03958..fa28aa92 100644
--- a/bootstrap/unix-48/Texts.h
+++ b/bootstrap/unix-48/Texts.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef Texts__h
 #define Texts__h
@@ -131,7 +131,7 @@ import ADDRESS *Texts_Writer__typ;
 
 import void Texts_Append (Texts_Text T, Texts_Buffer B);
 import void Texts_ChangeLooks (Texts_Text T, INT32 beg, INT32 end, UINT32 sel, Texts_FontsFont fnt, INT8 col, INT8 voff);
-import void Texts_Close (Texts_Text T, CHAR *name, LONGINT name__len);
+import void Texts_Close (Texts_Text T, CHAR *name, ADDRESS name__len);
 import void Texts_Copy (Texts_Buffer SB, Texts_Buffer DB);
 import void Texts_CopyElem (Texts_Elem SE, Texts_Elem DE);
 import void Texts_Delete (Texts_Text T, INT32 beg, INT32 end);
@@ -139,7 +139,7 @@ import Texts_Text Texts_ElemBase (Texts_Elem E);
 import INT32 Texts_ElemPos (Texts_Elem E);
 import void Texts_Insert (Texts_Text T, INT32 pos, Texts_Buffer B);
 import void Texts_Load (Files_Rider *r, ADDRESS *r__typ, Texts_Text T);
-import void Texts_Open (Texts_Text T, CHAR *name, LONGINT name__len);
+import void Texts_Open (Texts_Text T, CHAR *name, ADDRESS name__len);
 import void Texts_OpenBuf (Texts_Buffer B);
 import void Texts_OpenReader (Texts_Reader *R, ADDRESS *R__typ, Texts_Text T, INT32 pos);
 import void Texts_OpenScanner (Texts_Scanner *S, ADDRESS *S__typ, Texts_Text T, INT32 pos);
@@ -166,7 +166,7 @@ import void Texts_WriteLongRealHex (Texts_Writer *W, ADDRESS *W__typ, LONGREAL x
 import void Texts_WriteReal (Texts_Writer *W, ADDRESS *W__typ, REAL x, INT16 n);
 import void Texts_WriteRealFix (Texts_Writer *W, ADDRESS *W__typ, REAL x, INT16 n, INT16 k);
 import void Texts_WriteRealHex (Texts_Writer *W, ADDRESS *W__typ, REAL x);
-import void Texts_WriteString (Texts_Writer *W, ADDRESS *W__typ, CHAR *s, LONGINT s__len);
+import void Texts_WriteString (Texts_Writer *W, ADDRESS *W__typ, CHAR *s, ADDRESS s__len);
 import void *Texts__init(void);
 
 
diff --git a/bootstrap/unix-48/VT100.c b/bootstrap/unix-48/VT100.c
index f69fd90e..38c0743f 100644
--- a/bootstrap/unix-48/VT100.c
+++ b/bootstrap/unix-48/VT100.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
@@ -27,23 +27,23 @@ export void VT100_DECTCEMl (void);
 export void VT100_DSR (INT16 n);
 export void VT100_ED (INT16 n);
 export void VT100_EL (INT16 n);
-static void VT100_EscSeq (INT16 n, CHAR *letter, LONGINT letter__len);
-static void VT100_EscSeq0 (CHAR *letter, LONGINT letter__len);
-static void VT100_EscSeq2 (INT16 n, INT16 m, CHAR *letter, LONGINT letter__len);
-static void VT100_EscSeqSwapped (INT16 n, CHAR *letter, LONGINT letter__len);
+static void VT100_EscSeq (INT16 n, CHAR *letter, ADDRESS letter__len);
+static void VT100_EscSeq0 (CHAR *letter, ADDRESS letter__len);
+static void VT100_EscSeq2 (INT16 n, INT16 m, CHAR *letter, ADDRESS letter__len);
+static void VT100_EscSeqSwapped (INT16 n, CHAR *letter, ADDRESS letter__len);
 export void VT100_HVP (INT16 n, INT16 m);
-export void VT100_IntToStr (INT32 int_, CHAR *str, LONGINT str__len);
+export void VT100_IntToStr (INT32 int_, CHAR *str, ADDRESS str__len);
 export void VT100_RCP (void);
-static void VT100_Reverse0 (CHAR *str, LONGINT str__len, INT16 start, INT16 end);
+static void VT100_Reverse0 (CHAR *str, ADDRESS str__len, INT16 start, INT16 end);
 export void VT100_SCP (void);
 export void VT100_SD (INT16 n);
 export void VT100_SGR (INT16 n);
 export void VT100_SGR2 (INT16 n, INT16 m);
 export void VT100_SU (INT16 n);
-export void VT100_SetAttr (CHAR *attr, LONGINT attr__len);
+export void VT100_SetAttr (CHAR *attr, ADDRESS attr__len);
 
 
-static void VT100_Reverse0 (CHAR *str, LONGINT str__len, INT16 start, INT16 end)
+static void VT100_Reverse0 (CHAR *str, ADDRESS str__len, INT16 start, INT16 end)
 {
 	CHAR h;
 	while (start < end) {
@@ -55,7 +55,7 @@ static void VT100_Reverse0 (CHAR *str, LONGINT str__len, INT16 start, INT16 end)
 	}
 }
 
-void VT100_IntToStr (INT32 int_, CHAR *str, LONGINT str__len)
+void VT100_IntToStr (INT32 int_, CHAR *str, ADDRESS str__len)
 {
 	CHAR b[21];
 	INT16 s, e;
@@ -84,7 +84,7 @@ void VT100_IntToStr (INT32 int_, CHAR *str, LONGINT str__len)
 	__COPY(b, str, str__len);
 }
 
-static void VT100_EscSeq0 (CHAR *letter, LONGINT letter__len)
+static void VT100_EscSeq0 (CHAR *letter, ADDRESS letter__len)
 {
 	CHAR cmd[9];
 	__DUP(letter, letter__len, CHAR);
@@ -94,7 +94,7 @@ static void VT100_EscSeq0 (CHAR *letter, LONGINT letter__len)
 	__DEL(letter);
 }
 
-static void VT100_EscSeq (INT16 n, CHAR *letter, LONGINT letter__len)
+static void VT100_EscSeq (INT16 n, CHAR *letter, ADDRESS letter__len)
 {
 	CHAR nstr[2];
 	CHAR cmd[7];
@@ -107,7 +107,7 @@ static void VT100_EscSeq (INT16 n, CHAR *letter, LONGINT letter__len)
 	__DEL(letter);
 }
 
-static void VT100_EscSeqSwapped (INT16 n, CHAR *letter, LONGINT letter__len)
+static void VT100_EscSeqSwapped (INT16 n, CHAR *letter, ADDRESS letter__len)
 {
 	CHAR nstr[2];
 	CHAR cmd[7];
@@ -120,7 +120,7 @@ static void VT100_EscSeqSwapped (INT16 n, CHAR *letter, LONGINT letter__len)
 	__DEL(letter);
 }
 
-static void VT100_EscSeq2 (INT16 n, INT16 m, CHAR *letter, LONGINT letter__len)
+static void VT100_EscSeq2 (INT16 n, INT16 m, CHAR *letter, ADDRESS letter__len)
 {
 	CHAR nstr[5], mstr[5];
 	CHAR cmd[12];
@@ -236,7 +236,7 @@ void VT100_DECTCEMh (void)
 	VT100_EscSeq0((CHAR*)"\?25h", 5);
 }
 
-void VT100_SetAttr (CHAR *attr, LONGINT attr__len)
+void VT100_SetAttr (CHAR *attr, ADDRESS attr__len)
 {
 	CHAR tmpstr[16];
 	__DUP(attr, attr__len, CHAR);
diff --git a/bootstrap/unix-48/VT100.h b/bootstrap/unix-48/VT100.h
index d99406ec..4bbb3110 100644
--- a/bootstrap/unix-48/VT100.h
+++ b/bootstrap/unix-48/VT100.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef VT100__h
 #define VT100__h
@@ -23,14 +23,14 @@ import void VT100_DSR (INT16 n);
 import void VT100_ED (INT16 n);
 import void VT100_EL (INT16 n);
 import void VT100_HVP (INT16 n, INT16 m);
-import void VT100_IntToStr (INT32 int_, CHAR *str, LONGINT str__len);
+import void VT100_IntToStr (INT32 int_, CHAR *str, ADDRESS str__len);
 import void VT100_RCP (void);
 import void VT100_SCP (void);
 import void VT100_SD (INT16 n);
 import void VT100_SGR (INT16 n);
 import void VT100_SGR2 (INT16 n, INT16 m);
 import void VT100_SU (INT16 n);
-import void VT100_SetAttr (CHAR *attr, LONGINT attr__len);
+import void VT100_SetAttr (CHAR *attr, ADDRESS attr__len);
 import void *VT100__init(void);
 
 
diff --git a/bootstrap/unix-48/extTools.c b/bootstrap/unix-48/extTools.c
index 37630d23..66f80319 100644
--- a/bootstrap/unix-48/extTools.c
+++ b/bootstrap/unix-48/extTools.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
@@ -17,13 +17,13 @@
 static CHAR extTools_CFLAGS[1023];
 
 
-export void extTools_Assemble (CHAR *moduleName, LONGINT moduleName__len);
-static void extTools_InitialiseCompilerCommand (CHAR *s, LONGINT s__len);
-export void extTools_LinkMain (CHAR *moduleName, LONGINT moduleName__len, BOOLEAN statically, CHAR *additionalopts, LONGINT additionalopts__len);
-static void extTools_execute (CHAR *title, LONGINT title__len, CHAR *cmd, LONGINT cmd__len);
+export void extTools_Assemble (CHAR *moduleName, ADDRESS moduleName__len);
+static void extTools_InitialiseCompilerCommand (CHAR *s, ADDRESS s__len);
+export void extTools_LinkMain (CHAR *moduleName, ADDRESS moduleName__len, BOOLEAN statically, CHAR *additionalopts, ADDRESS additionalopts__len);
+static void extTools_execute (CHAR *title, ADDRESS title__len, CHAR *cmd, ADDRESS cmd__len);
 
 
-static void extTools_execute (CHAR *title, LONGINT title__len, CHAR *cmd, LONGINT cmd__len)
+static void extTools_execute (CHAR *title, ADDRESS title__len, CHAR *cmd, ADDRESS cmd__len)
 {
 	INT16 r, status, exitcode;
 	__DUP(title, title__len, CHAR);
@@ -63,7 +63,7 @@ static void extTools_execute (CHAR *title, LONGINT title__len, CHAR *cmd, LONGIN
 	__DEL(cmd);
 }
 
-static void extTools_InitialiseCompilerCommand (CHAR *s, LONGINT s__len)
+static void extTools_InitialiseCompilerCommand (CHAR *s, ADDRESS s__len)
 {
 	__COPY("gcc -g", s, s__len);
 	Strings_Append((CHAR*)" -I \"", 6, (void*)s, s__len);
@@ -74,7 +74,7 @@ static void extTools_InitialiseCompilerCommand (CHAR *s, LONGINT s__len)
 	Strings_Append((CHAR*)" ", 2, (void*)s, s__len);
 }
 
-void extTools_Assemble (CHAR *moduleName, LONGINT moduleName__len)
+void extTools_Assemble (CHAR *moduleName, ADDRESS moduleName__len)
 {
 	CHAR cmd[1023];
 	__DUP(moduleName, moduleName__len, CHAR);
@@ -86,7 +86,7 @@ void extTools_Assemble (CHAR *moduleName, LONGINT moduleName__len)
 	__DEL(moduleName);
 }
 
-void extTools_LinkMain (CHAR *moduleName, LONGINT moduleName__len, BOOLEAN statically, CHAR *additionalopts, LONGINT additionalopts__len)
+void extTools_LinkMain (CHAR *moduleName, ADDRESS moduleName__len, BOOLEAN statically, CHAR *additionalopts, ADDRESS additionalopts__len)
 {
 	CHAR cmd[1023];
 	__DUP(additionalopts, additionalopts__len, CHAR);
diff --git a/bootstrap/unix-48/extTools.h b/bootstrap/unix-48/extTools.h
index 63e5df15..472c60f3 100644
--- a/bootstrap/unix-48/extTools.h
+++ b/bootstrap/unix-48/extTools.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef extTools__h
 #define extTools__h
@@ -8,8 +8,8 @@
 
 
 
-import void extTools_Assemble (CHAR *moduleName, LONGINT moduleName__len);
-import void extTools_LinkMain (CHAR *moduleName, LONGINT moduleName__len, BOOLEAN statically, CHAR *additionalopts, LONGINT additionalopts__len);
+import void extTools_Assemble (CHAR *moduleName, ADDRESS moduleName__len);
+import void extTools_LinkMain (CHAR *moduleName, ADDRESS moduleName__len, BOOLEAN statically, CHAR *additionalopts, ADDRESS additionalopts__len);
 import void *extTools__init(void);
 
 
diff --git a/bootstrap/unix-88/Compiler.c b/bootstrap/unix-88/Compiler.c
index dc4bb660..e900905f 100644
--- a/bootstrap/unix-88/Compiler.c
+++ b/bootstrap/unix-88/Compiler.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. xtspamS */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. xtspamS */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/unix-88/Configuration.c b/bootstrap/unix-88/Configuration.c
index 2d0061df..071d7b8e 100644
--- a/bootstrap/unix-88/Configuration.c
+++ b/bootstrap/unix-88/Configuration.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
@@ -19,6 +19,6 @@ export void *Configuration__init(void)
 	__DEFMOD;
 	__REGMOD("Configuration", 0);
 /* BEGIN */
-	__MOVE("1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8.", Configuration_versionLong, 75);
+	__MOVE("2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8.", Configuration_versionLong, 75);
 	__ENDMOD;
 }
diff --git a/bootstrap/unix-88/Configuration.h b/bootstrap/unix-88/Configuration.h
index b28e0caa..b1942442 100644
--- a/bootstrap/unix-88/Configuration.h
+++ b/bootstrap/unix-88/Configuration.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef Configuration__h
 #define Configuration__h
diff --git a/bootstrap/unix-88/Files.c b/bootstrap/unix-88/Files.c
index 826c3d63..6a53103d 100644
--- a/bootstrap/unix-88/Files.c
+++ b/bootstrap/unix-88/Files.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. tspaSF */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. tspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
@@ -52,7 +52,7 @@ static Files_File Files_files;
 static INT16 Files_tempno;
 static CHAR Files_HOME[1024];
 static struct {
-	LONGINT len[1];
+	ADDRESS len[1];
 	CHAR data[1];
 } *Files_SearchPath;
 
@@ -62,56 +62,56 @@ export ADDRESS *Files_Rider__typ;
 
 export Files_File Files_Base (Files_Rider *r, ADDRESS *r__typ);
 static Files_File Files_CacheEntry (Platform_FileIdentity identity);
-export void Files_ChangeDirectory (CHAR *path, LONGINT path__len, INT16 *res);
+export void Files_ChangeDirectory (CHAR *path, ADDRESS path__len, INT16 *res);
 export void Files_Close (Files_File f);
 static void Files_CloseOSFile (Files_File f);
 static void Files_Create (Files_File f);
-export void Files_Delete (CHAR *name, LONGINT name__len, INT16 *res);
-static void Files_Err (CHAR *s, LONGINT s__len, Files_File f, INT16 errcode);
+export void Files_Delete (CHAR *name, ADDRESS name__len, INT16 *res);
+static void Files_Err (CHAR *s, ADDRESS s__len, Files_File f, INT16 errcode);
 static void Files_Finalize (SYSTEM_PTR o);
-static void Files_FlipBytes (SYSTEM_BYTE *src, LONGINT src__len, SYSTEM_BYTE *dest, LONGINT dest__len);
+static void Files_FlipBytes (SYSTEM_BYTE *src, ADDRESS src__len, SYSTEM_BYTE *dest, ADDRESS dest__len);
 static void Files_Flush (Files_Buffer buf);
 export void Files_GetDate (Files_File f, INT32 *t, INT32 *d);
-export void Files_GetName (Files_File f, CHAR *name, LONGINT name__len);
-static void Files_GetTempName (CHAR *finalName, LONGINT finalName__len, CHAR *name, LONGINT name__len);
-static BOOLEAN Files_HasDir (CHAR *name, LONGINT name__len);
+export void Files_GetName (Files_File f, CHAR *name, ADDRESS name__len);
+static void Files_GetTempName (CHAR *finalName, ADDRESS finalName__len, CHAR *name, ADDRESS name__len);
+static BOOLEAN Files_HasDir (CHAR *name, ADDRESS name__len);
 export INT32 Files_Length (Files_File f);
-static void Files_MakeFileName (CHAR *dir, LONGINT dir__len, CHAR *name, LONGINT name__len, CHAR *dest, LONGINT dest__len);
-export Files_File Files_New (CHAR *name, LONGINT name__len);
-export Files_File Files_Old (CHAR *name, LONGINT name__len);
+static void Files_MakeFileName (CHAR *dir, ADDRESS dir__len, CHAR *name, ADDRESS name__len, CHAR *dest, ADDRESS dest__len);
+export Files_File Files_New (CHAR *name, ADDRESS name__len);
+export Files_File Files_Old (CHAR *name, ADDRESS name__len);
 export INT32 Files_Pos (Files_Rider *r, ADDRESS *r__typ);
 export void Files_Purge (Files_File f);
 export void Files_Read (Files_Rider *r, ADDRESS *r__typ, SYSTEM_BYTE *x);
 export void Files_ReadBool (Files_Rider *R, ADDRESS *R__typ, BOOLEAN *x);
-export void Files_ReadBytes (Files_Rider *r, ADDRESS *r__typ, SYSTEM_BYTE *x, LONGINT x__len, INT32 n);
+export void Files_ReadBytes (Files_Rider *r, ADDRESS *r__typ, SYSTEM_BYTE *x, ADDRESS x__len, INT32 n);
 export void Files_ReadInt (Files_Rider *R, ADDRESS *R__typ, INT16 *x);
 export void Files_ReadLInt (Files_Rider *R, ADDRESS *R__typ, INT32 *x);
 export void Files_ReadLReal (Files_Rider *R, ADDRESS *R__typ, LONGREAL *x);
-export void Files_ReadLine (Files_Rider *R, ADDRESS *R__typ, CHAR *x, LONGINT x__len);
-export void Files_ReadNum (Files_Rider *R, ADDRESS *R__typ, SYSTEM_BYTE *x, LONGINT x__len);
+export void Files_ReadLine (Files_Rider *R, ADDRESS *R__typ, CHAR *x, ADDRESS x__len);
+export void Files_ReadNum (Files_Rider *R, ADDRESS *R__typ, SYSTEM_BYTE *x, ADDRESS x__len);
 export void Files_ReadReal (Files_Rider *R, ADDRESS *R__typ, REAL *x);
 export void Files_ReadSet (Files_Rider *R, ADDRESS *R__typ, UINT32 *x);
-export void Files_ReadString (Files_Rider *R, ADDRESS *R__typ, CHAR *x, LONGINT x__len);
+export void Files_ReadString (Files_Rider *R, ADDRESS *R__typ, CHAR *x, ADDRESS x__len);
 export void Files_Register (Files_File f);
-export void Files_Rename (CHAR *old, LONGINT old__len, CHAR *new, LONGINT new__len, INT16 *res);
-static void Files_ScanPath (INT16 *pos, CHAR *dir, LONGINT dir__len);
+export void Files_Rename (CHAR *old, ADDRESS old__len, CHAR *new, ADDRESS new__len, INT16 *res);
+static void Files_ScanPath (INT16 *pos, CHAR *dir, ADDRESS dir__len);
 export void Files_Set (Files_Rider *r, ADDRESS *r__typ, Files_File f, INT32 pos);
-export void Files_SetSearchPath (CHAR *path, LONGINT path__len);
+export void Files_SetSearchPath (CHAR *path, ADDRESS path__len);
 export void Files_Write (Files_Rider *r, ADDRESS *r__typ, SYSTEM_BYTE x);
 export void Files_WriteBool (Files_Rider *R, ADDRESS *R__typ, BOOLEAN x);
-export void Files_WriteBytes (Files_Rider *r, ADDRESS *r__typ, SYSTEM_BYTE *x, LONGINT x__len, INT32 n);
+export void Files_WriteBytes (Files_Rider *r, ADDRESS *r__typ, SYSTEM_BYTE *x, ADDRESS x__len, INT32 n);
 export void Files_WriteInt (Files_Rider *R, ADDRESS *R__typ, INT16 x);
 export void Files_WriteLInt (Files_Rider *R, ADDRESS *R__typ, INT32 x);
 export void Files_WriteLReal (Files_Rider *R, ADDRESS *R__typ, LONGREAL x);
 export void Files_WriteNum (Files_Rider *R, ADDRESS *R__typ, INT64 x);
 export void Files_WriteReal (Files_Rider *R, ADDRESS *R__typ, REAL x);
 export void Files_WriteSet (Files_Rider *R, ADDRESS *R__typ, UINT32 x);
-export void Files_WriteString (Files_Rider *R, ADDRESS *R__typ, CHAR *x, LONGINT x__len);
+export void Files_WriteString (Files_Rider *R, ADDRESS *R__typ, CHAR *x, ADDRESS x__len);
 
 #define Files_IdxTrap()	__HALT(-1)
 #define Files_ToAdr(x)	(ADDRESS)x
 
-static void Files_Err (CHAR *s, LONGINT s__len, Files_File f, INT16 errcode)
+static void Files_Err (CHAR *s, ADDRESS s__len, Files_File f, INT16 errcode)
 {
 	__DUP(s, s__len, CHAR);
 	Out_Ln();
@@ -138,7 +138,7 @@ static void Files_Err (CHAR *s, LONGINT s__len, Files_File f, INT16 errcode)
 	__DEL(s);
 }
 
-static void Files_MakeFileName (CHAR *dir, LONGINT dir__len, CHAR *name, LONGINT name__len, CHAR *dest, LONGINT dest__len)
+static void Files_MakeFileName (CHAR *dir, ADDRESS dir__len, CHAR *name, ADDRESS name__len, CHAR *dest, ADDRESS dest__len)
 {
 	INT16 i, j;
 	__DUP(dir, dir__len, CHAR);
@@ -163,7 +163,7 @@ static void Files_MakeFileName (CHAR *dir, LONGINT dir__len, CHAR *name, LONGINT
 	__DEL(name);
 }
 
-static void Files_GetTempName (CHAR *finalName, LONGINT finalName__len, CHAR *name, LONGINT name__len)
+static void Files_GetTempName (CHAR *finalName, ADDRESS finalName__len, CHAR *name, ADDRESS name__len)
 {
 	INT32 n, i, j;
 	__DUP(finalName, finalName__len, CHAR);
@@ -316,7 +316,7 @@ INT32 Files_Length (Files_File f)
 	return f->len;
 }
 
-Files_File Files_New (CHAR *name, LONGINT name__len)
+Files_File Files_New (CHAR *name, ADDRESS name__len)
 {
 	Files_File f = NIL;
 	__DUP(name, name__len, CHAR);
@@ -332,7 +332,7 @@ Files_File Files_New (CHAR *name, LONGINT name__len)
 	return f;
 }
 
-static void Files_ScanPath (INT16 *pos, CHAR *dir, LONGINT dir__len)
+static void Files_ScanPath (INT16 *pos, CHAR *dir, ADDRESS dir__len)
 {
 	INT16 i;
 	CHAR ch;
@@ -375,7 +375,7 @@ static void Files_ScanPath (INT16 *pos, CHAR *dir, LONGINT dir__len)
 	dir[i] = 0x00;
 }
 
-static BOOLEAN Files_HasDir (CHAR *name, LONGINT name__len)
+static BOOLEAN Files_HasDir (CHAR *name, ADDRESS name__len)
 {
 	INT16 i;
 	CHAR ch;
@@ -415,7 +415,7 @@ static Files_File Files_CacheEntry (Platform_FileIdentity identity)
 	return NIL;
 }
 
-Files_File Files_Old (CHAR *name, LONGINT name__len)
+Files_File Files_Old (CHAR *name, ADDRESS name__len)
 {
 	Files_File f = NIL;
 	INT32 fd;
@@ -618,7 +618,7 @@ void Files_Read (Files_Rider *r, ADDRESS *r__typ, SYSTEM_BYTE *x)
 	}
 }
 
-void Files_ReadBytes (Files_Rider *r, ADDRESS *r__typ, SYSTEM_BYTE *x, LONGINT x__len, INT32 n)
+void Files_ReadBytes (Files_Rider *r, ADDRESS *r__typ, SYSTEM_BYTE *x, ADDRESS x__len, INT32 n)
 {
 	INT32 xpos, min, restInBuf, offset;
 	Files_Buffer buf = NIL;
@@ -683,7 +683,7 @@ void Files_Write (Files_Rider *r, ADDRESS *r__typ, SYSTEM_BYTE x)
 	(*r).res = 0;
 }
 
-void Files_WriteBytes (Files_Rider *r, ADDRESS *r__typ, SYSTEM_BYTE *x, LONGINT x__len, INT32 n)
+void Files_WriteBytes (Files_Rider *r, ADDRESS *r__typ, SYSTEM_BYTE *x, ADDRESS x__len, INT32 n)
 {
 	INT32 xpos, min, restInBuf, offset;
 	Files_Buffer buf = NIL;
@@ -722,14 +722,14 @@ void Files_WriteBytes (Files_Rider *r, ADDRESS *r__typ, SYSTEM_BYTE *x, LONGINT
 	(*r).res = 0;
 }
 
-void Files_Delete (CHAR *name, LONGINT name__len, INT16 *res)
+void Files_Delete (CHAR *name, ADDRESS name__len, INT16 *res)
 {
 	__DUP(name, name__len, CHAR);
 	*res = Platform_Unlink((void*)name, name__len);
 	__DEL(name);
 }
 
-void Files_Rename (CHAR *old, LONGINT old__len, CHAR *new, LONGINT new__len, INT16 *res)
+void Files_Rename (CHAR *old, ADDRESS old__len, CHAR *new, ADDRESS new__len, INT16 *res)
 {
 	INT32 fdold, fdnew, n;
 	INT16 error, ignore;
@@ -812,14 +812,14 @@ void Files_Register (Files_File f)
 	}
 }
 
-void Files_ChangeDirectory (CHAR *path, LONGINT path__len, INT16 *res)
+void Files_ChangeDirectory (CHAR *path, ADDRESS path__len, INT16 *res)
 {
 	__DUP(path, path__len, CHAR);
 	*res = Platform_Chdir((void*)path, path__len);
 	__DEL(path);
 }
 
-static void Files_FlipBytes (SYSTEM_BYTE *src, LONGINT src__len, SYSTEM_BYTE *dest, LONGINT dest__len)
+static void Files_FlipBytes (SYSTEM_BYTE *src, ADDRESS src__len, SYSTEM_BYTE *dest, ADDRESS dest__len)
 {
 	INT32 i, j;
 	if (!Platform_LittleEndian) {
@@ -877,7 +877,7 @@ void Files_ReadLReal (Files_Rider *R, ADDRESS *R__typ, LONGREAL *x)
 	Files_FlipBytes((void*)b, 8, (void*)&*x, 8);
 }
 
-void Files_ReadString (Files_Rider *R, ADDRESS *R__typ, CHAR *x, LONGINT x__len)
+void Files_ReadString (Files_Rider *R, ADDRESS *R__typ, CHAR *x, ADDRESS x__len)
 {
 	INT16 i;
 	CHAR ch;
@@ -889,7 +889,7 @@ void Files_ReadString (Files_Rider *R, ADDRESS *R__typ, CHAR *x, LONGINT x__len)
 	} while (!(ch == 0x00));
 }
 
-void Files_ReadLine (Files_Rider *R, ADDRESS *R__typ, CHAR *x, LONGINT x__len)
+void Files_ReadLine (Files_Rider *R, ADDRESS *R__typ, CHAR *x, ADDRESS x__len)
 {
 	INT16 i;
 	i = 0;
@@ -906,7 +906,7 @@ void Files_ReadLine (Files_Rider *R, ADDRESS *R__typ, CHAR *x, LONGINT x__len)
 	x[i] = 0x00;
 }
 
-void Files_ReadNum (Files_Rider *R, ADDRESS *R__typ, SYSTEM_BYTE *x, LONGINT x__len)
+void Files_ReadNum (Files_Rider *R, ADDRESS *R__typ, SYSTEM_BYTE *x, ADDRESS x__len)
 {
 	INT8 s, b;
 	INT64 q;
@@ -972,7 +972,7 @@ void Files_WriteLReal (Files_Rider *R, ADDRESS *R__typ, LONGREAL x)
 	Files_WriteBytes(&*R, R__typ, (void*)b, 8, 8);
 }
 
-void Files_WriteString (Files_Rider *R, ADDRESS *R__typ, CHAR *x, LONGINT x__len)
+void Files_WriteString (Files_Rider *R, ADDRESS *R__typ, CHAR *x, ADDRESS x__len)
 {
 	INT16 i;
 	i = 0;
@@ -991,7 +991,7 @@ void Files_WriteNum (Files_Rider *R, ADDRESS *R__typ, INT64 x)
 	Files_Write(&*R, R__typ, (CHAR)__MASK(x, -128));
 }
 
-void Files_GetName (Files_File f, CHAR *name, LONGINT name__len)
+void Files_GetName (Files_File f, CHAR *name, ADDRESS name__len)
 {
 	__COPY(f->workName, name, name__len);
 }
@@ -1009,7 +1009,7 @@ static void Files_Finalize (SYSTEM_PTR o)
 	}
 }
 
-void Files_SetSearchPath (CHAR *path, LONGINT path__len)
+void Files_SetSearchPath (CHAR *path, ADDRESS path__len)
 {
 	__DUP(path, path__len, CHAR);
 	if (Strings_Length(path, path__len) != 0) {
diff --git a/bootstrap/unix-88/Files.h b/bootstrap/unix-88/Files.h
index 855c5f7c..5a99da54 100644
--- a/bootstrap/unix-88/Files.h
+++ b/bootstrap/unix-88/Files.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. tspaSF */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. tspaSF */
 
 #ifndef Files__h
 #define Files__h
@@ -30,41 +30,41 @@ import ADDRESS *Files_FileDesc__typ;
 import ADDRESS *Files_Rider__typ;
 
 import Files_File Files_Base (Files_Rider *r, ADDRESS *r__typ);
-import void Files_ChangeDirectory (CHAR *path, LONGINT path__len, INT16 *res);
+import void Files_ChangeDirectory (CHAR *path, ADDRESS path__len, INT16 *res);
 import void Files_Close (Files_File f);
-import void Files_Delete (CHAR *name, LONGINT name__len, INT16 *res);
+import void Files_Delete (CHAR *name, ADDRESS name__len, INT16 *res);
 import void Files_GetDate (Files_File f, INT32 *t, INT32 *d);
-import void Files_GetName (Files_File f, CHAR *name, LONGINT name__len);
+import void Files_GetName (Files_File f, CHAR *name, ADDRESS name__len);
 import INT32 Files_Length (Files_File f);
-import Files_File Files_New (CHAR *name, LONGINT name__len);
-import Files_File Files_Old (CHAR *name, LONGINT name__len);
+import Files_File Files_New (CHAR *name, ADDRESS name__len);
+import Files_File Files_Old (CHAR *name, ADDRESS name__len);
 import INT32 Files_Pos (Files_Rider *r, ADDRESS *r__typ);
 import void Files_Purge (Files_File f);
 import void Files_Read (Files_Rider *r, ADDRESS *r__typ, SYSTEM_BYTE *x);
 import void Files_ReadBool (Files_Rider *R, ADDRESS *R__typ, BOOLEAN *x);
-import void Files_ReadBytes (Files_Rider *r, ADDRESS *r__typ, SYSTEM_BYTE *x, LONGINT x__len, INT32 n);
+import void Files_ReadBytes (Files_Rider *r, ADDRESS *r__typ, SYSTEM_BYTE *x, ADDRESS x__len, INT32 n);
 import void Files_ReadInt (Files_Rider *R, ADDRESS *R__typ, INT16 *x);
 import void Files_ReadLInt (Files_Rider *R, ADDRESS *R__typ, INT32 *x);
 import void Files_ReadLReal (Files_Rider *R, ADDRESS *R__typ, LONGREAL *x);
-import void Files_ReadLine (Files_Rider *R, ADDRESS *R__typ, CHAR *x, LONGINT x__len);
-import void Files_ReadNum (Files_Rider *R, ADDRESS *R__typ, SYSTEM_BYTE *x, LONGINT x__len);
+import void Files_ReadLine (Files_Rider *R, ADDRESS *R__typ, CHAR *x, ADDRESS x__len);
+import void Files_ReadNum (Files_Rider *R, ADDRESS *R__typ, SYSTEM_BYTE *x, ADDRESS x__len);
 import void Files_ReadReal (Files_Rider *R, ADDRESS *R__typ, REAL *x);
 import void Files_ReadSet (Files_Rider *R, ADDRESS *R__typ, UINT32 *x);
-import void Files_ReadString (Files_Rider *R, ADDRESS *R__typ, CHAR *x, LONGINT x__len);
+import void Files_ReadString (Files_Rider *R, ADDRESS *R__typ, CHAR *x, ADDRESS x__len);
 import void Files_Register (Files_File f);
-import void Files_Rename (CHAR *old, LONGINT old__len, CHAR *new, LONGINT new__len, INT16 *res);
+import void Files_Rename (CHAR *old, ADDRESS old__len, CHAR *new, ADDRESS new__len, INT16 *res);
 import void Files_Set (Files_Rider *r, ADDRESS *r__typ, Files_File f, INT32 pos);
-import void Files_SetSearchPath (CHAR *path, LONGINT path__len);
+import void Files_SetSearchPath (CHAR *path, ADDRESS path__len);
 import void Files_Write (Files_Rider *r, ADDRESS *r__typ, SYSTEM_BYTE x);
 import void Files_WriteBool (Files_Rider *R, ADDRESS *R__typ, BOOLEAN x);
-import void Files_WriteBytes (Files_Rider *r, ADDRESS *r__typ, SYSTEM_BYTE *x, LONGINT x__len, INT32 n);
+import void Files_WriteBytes (Files_Rider *r, ADDRESS *r__typ, SYSTEM_BYTE *x, ADDRESS x__len, INT32 n);
 import void Files_WriteInt (Files_Rider *R, ADDRESS *R__typ, INT16 x);
 import void Files_WriteLInt (Files_Rider *R, ADDRESS *R__typ, INT32 x);
 import void Files_WriteLReal (Files_Rider *R, ADDRESS *R__typ, LONGREAL x);
 import void Files_WriteNum (Files_Rider *R, ADDRESS *R__typ, INT64 x);
 import void Files_WriteReal (Files_Rider *R, ADDRESS *R__typ, REAL x);
 import void Files_WriteSet (Files_Rider *R, ADDRESS *R__typ, UINT32 x);
-import void Files_WriteString (Files_Rider *R, ADDRESS *R__typ, CHAR *x, LONGINT x__len);
+import void Files_WriteString (Files_Rider *R, ADDRESS *R__typ, CHAR *x, ADDRESS x__len);
 import void *Files__init(void);
 
 
diff --git a/bootstrap/unix-88/Heap.c b/bootstrap/unix-88/Heap.c
index a2bb8f2f..032e9544 100644
--- a/bootstrap/unix-88/Heap.c
+++ b/bootstrap/unix-88/Heap.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. tsSF */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. tsSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
@@ -85,14 +85,14 @@ static void Heap_ExtendHeap (INT64 blksz);
 export void Heap_FINALL (void);
 static void Heap_Finalize (void);
 export void Heap_GC (BOOLEAN markStack);
-static void Heap_HeapSort (INT64 n, INT64 *a, LONGINT a__len);
+static void Heap_HeapSort (INT64 n, INT64 *a, ADDRESS a__len);
 export void Heap_INCREF (Heap_Module m);
 export void Heap_InitHeap (void);
 export void Heap_Lock (void);
 static void Heap_Mark (INT64 q);
-static void Heap_MarkCandidates (INT64 n, INT64 *cand, LONGINT cand__len);
+static void Heap_MarkCandidates (INT64 n, INT64 *cand, ADDRESS cand__len);
 static void Heap_MarkP (SYSTEM_PTR p);
-static void Heap_MarkStack (INT64 n, INT64 *cand, LONGINT cand__len);
+static void Heap_MarkStack (INT64 n, INT64 *cand, ADDRESS cand__len);
 export SYSTEM_PTR Heap_NEWBLK (INT64 size);
 export SYSTEM_PTR Heap_NEWREC (INT64 tag);
 static INT64 Heap_NewChunk (INT64 blksz);
@@ -101,7 +101,7 @@ export SYSTEM_PTR Heap_REGMOD (Heap_ModuleName name, Heap_EnumProc enumPtrs);
 export void Heap_REGTYP (Heap_Module m, INT64 typ);
 export void Heap_RegisterFinalizer (SYSTEM_PTR obj, Heap_Finalizer finalize);
 static void Heap_Scan (void);
-static void Heap_Sift (INT64 l, INT64 r, INT64 *a, LONGINT a__len);
+static void Heap_Sift (INT64 l, INT64 r, INT64 *a, ADDRESS a__len);
 export void Heap_Unlock (void);
 
 extern void *Heap__init();
@@ -445,7 +445,7 @@ static void Heap_Scan (void)
 	}
 }
 
-static void Heap_Sift (INT64 l, INT64 r, INT64 *a, LONGINT a__len)
+static void Heap_Sift (INT64 l, INT64 r, INT64 *a, ADDRESS a__len)
 {
 	INT64 i, j, x;
 	j = l;
@@ -464,7 +464,7 @@ static void Heap_Sift (INT64 l, INT64 r, INT64 *a, LONGINT a__len)
 	a[i] = x;
 }
 
-static void Heap_HeapSort (INT64 n, INT64 *a, LONGINT a__len)
+static void Heap_HeapSort (INT64 n, INT64 *a, ADDRESS a__len)
 {
 	INT64 l, r, x;
 	l = __ASHR(n, 1);
@@ -482,7 +482,7 @@ static void Heap_HeapSort (INT64 n, INT64 *a, LONGINT a__len)
 	}
 }
 
-static void Heap_MarkCandidates (INT64 n, INT64 *cand, LONGINT cand__len)
+static void Heap_MarkCandidates (INT64 n, INT64 *cand, ADDRESS cand__len)
 {
 	INT64 chnk, adr, tag, next, lim, lim1, i, ptr, size;
 	chnk = Heap_heap;
@@ -571,7 +571,7 @@ void Heap_FINALL (void)
 	}
 }
 
-static void Heap_MarkStack (INT64 n, INT64 *cand, LONGINT cand__len)
+static void Heap_MarkStack (INT64 n, INT64 *cand, ADDRESS cand__len)
 {
 	SYSTEM_PTR frame;
 	INT64 inc, nofcand, sp, p, stack0;
diff --git a/bootstrap/unix-88/Heap.h b/bootstrap/unix-88/Heap.h
index 163cad8c..bf12c17b 100644
--- a/bootstrap/unix-88/Heap.h
+++ b/bootstrap/unix-88/Heap.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. tsSF */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. tsSF */
 
 #ifndef Heap__h
 #define Heap__h
diff --git a/bootstrap/unix-88/Modules.c b/bootstrap/unix-88/Modules.c
index 4e4d62e7..12ee85c4 100644
--- a/bootstrap/unix-88/Modules.c
+++ b/bootstrap/unix-88/Modules.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
@@ -47,21 +47,21 @@ export Modules_ModuleName Modules_imported, Modules_importing;
 export ADDRESS *Modules_ModuleDesc__typ;
 export ADDRESS *Modules_CmdDesc__typ;
 
-static void Modules_Append (CHAR *a, LONGINT a__len, CHAR *b, LONGINT b__len);
+static void Modules_Append (CHAR *a, ADDRESS a__len, CHAR *b, ADDRESS b__len);
 export void Modules_AssertFail (INT32 code);
 static void Modules_DisplayHaltCode (INT32 code);
-export void Modules_Free (CHAR *name, LONGINT name__len, BOOLEAN all);
+export void Modules_Free (CHAR *name, ADDRESS name__len, BOOLEAN all);
 export void Modules_Halt (INT32 code);
-export Modules_Command Modules_ThisCommand (Modules_Module mod, CHAR *name, LONGINT name__len);
-export Modules_Module Modules_ThisMod (CHAR *name, LONGINT name__len);
+export Modules_Command Modules_ThisCommand (Modules_Module mod, CHAR *name, ADDRESS name__len);
+export Modules_Module Modules_ThisMod (CHAR *name, ADDRESS name__len);
 static void Modules_errch (CHAR c);
 static void Modules_errint (INT32 l);
-static void Modules_errstring (CHAR *s, LONGINT s__len);
+static void Modules_errstring (CHAR *s, ADDRESS s__len);
 
 #define Modules_modules()	(Modules_Module)Heap_modules
 #define Modules_setmodules(m)	Heap_modules = m
 
-static void Modules_Append (CHAR *a, LONGINT a__len, CHAR *b, LONGINT b__len)
+static void Modules_Append (CHAR *a, ADDRESS a__len, CHAR *b, ADDRESS b__len)
 {
 	INT16 i, j;
 	__DUP(b, b__len, CHAR);
@@ -79,7 +79,7 @@ static void Modules_Append (CHAR *a, LONGINT a__len, CHAR *b, LONGINT b__len)
 	__DEL(b);
 }
 
-Modules_Module Modules_ThisMod (CHAR *name, LONGINT name__len)
+Modules_Module Modules_ThisMod (CHAR *name, ADDRESS name__len)
 {
 	Modules_Module m = NIL;
 	CHAR bodyname[64];
@@ -103,7 +103,7 @@ Modules_Module Modules_ThisMod (CHAR *name, LONGINT name__len)
 	return m;
 }
 
-Modules_Command Modules_ThisCommand (Modules_Module mod, CHAR *name, LONGINT name__len)
+Modules_Command Modules_ThisCommand (Modules_Module mod, CHAR *name, ADDRESS name__len)
 {
 	Modules_Cmd c = NIL;
 	__DUP(name, name__len, CHAR);
@@ -130,7 +130,7 @@ Modules_Command Modules_ThisCommand (Modules_Module mod, CHAR *name, LONGINT nam
 	__RETCHK;
 }
 
-void Modules_Free (CHAR *name, LONGINT name__len, BOOLEAN all)
+void Modules_Free (CHAR *name, ADDRESS name__len, BOOLEAN all)
 {
 	Modules_Module m = NIL, p = NIL;
 	__DUP(name, name__len, CHAR);
@@ -168,7 +168,7 @@ static void Modules_errch (CHAR c)
 	e = Platform_Write(1, (ADDRESS)&c, 1);
 }
 
-static void Modules_errstring (CHAR *s, LONGINT s__len)
+static void Modules_errstring (CHAR *s, ADDRESS s__len)
 {
 	INT32 i;
 	__DUP(s, s__len, CHAR);
diff --git a/bootstrap/unix-88/Modules.h b/bootstrap/unix-88/Modules.h
index 8bb89fe5..b1f2385e 100644
--- a/bootstrap/unix-88/Modules.h
+++ b/bootstrap/unix-88/Modules.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef Modules__h
 #define Modules__h
@@ -44,10 +44,10 @@ import ADDRESS *Modules_ModuleDesc__typ;
 import ADDRESS *Modules_CmdDesc__typ;
 
 import void Modules_AssertFail (INT32 code);
-import void Modules_Free (CHAR *name, LONGINT name__len, BOOLEAN all);
+import void Modules_Free (CHAR *name, ADDRESS name__len, BOOLEAN all);
 import void Modules_Halt (INT32 code);
-import Modules_Command Modules_ThisCommand (Modules_Module mod, CHAR *name, LONGINT name__len);
-import Modules_Module Modules_ThisMod (CHAR *name, LONGINT name__len);
+import Modules_Command Modules_ThisCommand (Modules_Module mod, CHAR *name, ADDRESS name__len);
+import Modules_Module Modules_ThisMod (CHAR *name, ADDRESS name__len);
 import void *Modules__init(void);
 
 
diff --git a/bootstrap/unix-88/OPB.c b/bootstrap/unix-88/OPB.c
index 3ef8e2f9..bc44b83a 100644
--- a/bootstrap/unix-88/OPB.c
+++ b/bootstrap/unix-88/OPB.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/unix-88/OPB.h b/bootstrap/unix-88/OPB.h
index 0be714e8..eb93787e 100644
--- a/bootstrap/unix-88/OPB.h
+++ b/bootstrap/unix-88/OPB.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef OPB__h
 #define OPB__h
diff --git a/bootstrap/unix-88/OPC.c b/bootstrap/unix-88/OPC.c
index ef4b429f..72e0feef 100644
--- a/bootstrap/unix-88/OPC.c
+++ b/bootstrap/unix-88/OPC.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
@@ -56,7 +56,7 @@ static void OPC_GenHeaderMsg (void);
 export void OPC_Halt (INT32 n);
 export void OPC_Ident (OPT_Object obj);
 static void OPC_IdentList (OPT_Object obj, INT16 vis);
-static void OPC_Include (CHAR *name, LONGINT name__len);
+static void OPC_Include (CHAR *name, ADDRESS name__len);
 static void OPC_IncludeImports (OPT_Object obj, INT16 vis);
 export void OPC_Increment (BOOLEAN decrement);
 export void OPC_Indent (INT16 count);
@@ -68,11 +68,11 @@ static void OPC_InitTProcs (OPT_Object typ, OPT_Object obj);
 export void OPC_IntLiteral (INT64 n, INT32 size);
 export void OPC_Len (OPT_Object obj, OPT_Struct array, INT64 dim);
 static void OPC_LenList (OPT_Object par, BOOLEAN ansiDefine, BOOLEAN showParamName);
-static INT16 OPC_Length (CHAR *s, LONGINT s__len);
+static INT16 OPC_Length (CHAR *s, ADDRESS s__len);
 export BOOLEAN OPC_NeedsRetval (OPT_Object proc);
 export INT32 OPC_NofPtrs (OPT_Struct typ);
-static INT16 OPC_PerfectHash (CHAR *s, LONGINT s__len);
-static BOOLEAN OPC_Prefixed (OPT_ConstExt x, CHAR *y, LONGINT y__len);
+static INT16 OPC_PerfectHash (CHAR *s, ADDRESS s__len);
+static BOOLEAN OPC_Prefixed (OPT_ConstExt x, CHAR *y, ADDRESS y__len);
 static void OPC_ProcHeader (OPT_Object proc, BOOLEAN define);
 static void OPC_ProcPredefs (OPT_Object obj, INT8 vis);
 static void OPC_PutBase (OPT_Struct typ);
@@ -80,8 +80,8 @@ static void OPC_PutPtrOffsets (OPT_Struct typ, INT32 adr, INT32 *cnt);
 static void OPC_RegCmds (OPT_Object obj);
 export void OPC_SetInclude (BOOLEAN exclude);
 static void OPC_Stars (OPT_Struct typ, BOOLEAN *openClause);
-static void OPC_Str1 (CHAR *s, LONGINT s__len, INT32 x);
-static void OPC_StringLiteral (CHAR *s, LONGINT s__len, INT32 l);
+static void OPC_Str1 (CHAR *s, ADDRESS s__len, INT32 x);
+static void OPC_StringLiteral (CHAR *s, ADDRESS s__len, INT32 l);
 export void OPC_TDescDecl (OPT_Struct typ);
 export void OPC_TypeDefs (OPT_Object obj, INT16 vis);
 export void OPC_TypeOf (OPT_Object ap);
@@ -137,7 +137,7 @@ void OPC_EndBlk0 (void)
 	OPM_Write('}');
 }
 
-static void OPC_Str1 (CHAR *s, LONGINT s__len, INT32 x)
+static void OPC_Str1 (CHAR *s, ADDRESS s__len, INT32 x)
 {
 	CHAR ch;
 	INT16 i;
@@ -156,7 +156,7 @@ static void OPC_Str1 (CHAR *s, LONGINT s__len, INT32 x)
 	__DEL(s);
 }
 
-static INT16 OPC_Length (CHAR *s, LONGINT s__len)
+static INT16 OPC_Length (CHAR *s, ADDRESS s__len)
 {
 	INT16 i;
 	i = 0;
@@ -166,7 +166,7 @@ static INT16 OPC_Length (CHAR *s, LONGINT s__len)
 	return i;
 }
 
-static INT16 OPC_PerfectHash (CHAR *s, LONGINT s__len)
+static INT16 OPC_PerfectHash (CHAR *s, ADDRESS s__len)
 {
 	INT16 i, h;
 	i = 0;
@@ -364,7 +364,7 @@ static void OPC_DeclareBase (OPT_Object dcl)
 		OPM_WriteString((CHAR*)"struct ", 8);
 		OPC_BegBlk();
 		OPC_BegStat();
-		OPC_Str1((CHAR*)"LONGINT len[#]", 15, nofdims);
+		OPC_Str1((CHAR*)"ADDRESS len[#]", 15, nofdims);
 		OPC_EndStat();
 		OPC_BegStat();
 		__NEW(obj, OPT_ObjDesc);
@@ -511,7 +511,7 @@ static void OPC_LenList (OPT_Object par, BOOLEAN ansiDefine, BOOLEAN showParamNa
 	typ = par->typ->BaseTyp;
 	while (typ->comp == 3) {
 		if (ansiDefine) {
-			OPM_WriteString((CHAR*)", LONGINT ", 11);
+			OPM_WriteString((CHAR*)", ADDRESS ", 11);
 		} else {
 			OPM_WriteString((CHAR*)", ", 3);
 		}
@@ -720,7 +720,7 @@ static void OPC_DefineType (OPT_Struct str)
 	}
 }
 
-static BOOLEAN OPC_Prefixed (OPT_ConstExt x, CHAR *y, LONGINT y__len)
+static BOOLEAN OPC_Prefixed (OPT_ConstExt x, CHAR *y, ADDRESS y__len)
 {
 	INT16 i;
 	__DUP(y, y__len, CHAR);
@@ -969,7 +969,7 @@ static void OPC_IdentList (OPT_Object obj, INT16 vis)
 				OPC_EndStat();
 				OPC_BegStat();
 				base = OPT_linttyp;
-				OPM_WriteString((CHAR*)"LONGINT ", 9);
+				OPM_WriteString((CHAR*)"ADDRESS ", 9);
 				OPC_LenList(obj, 0, 1);
 			} else if ((obj->mode == 2 && obj->typ->comp == 4)) {
 				OPC_EndStat();
@@ -1008,7 +1008,7 @@ static void OPC_AnsiParamList (OPT_Object obj, BOOLEAN showParamNames)
 				__COPY(name, obj->name, 256);
 			}
 			if (obj->typ->comp == 3) {
-				OPM_WriteString((CHAR*)", LONGINT ", 11);
+				OPM_WriteString((CHAR*)", ADDRESS ", 11);
 				OPC_LenList(obj, 1, showParamNames);
 			} else if ((obj->mode == 2 && obj->typ->comp == 4)) {
 				OPM_WriteString((CHAR*)", ADDRESS *", 12);
@@ -1062,7 +1062,7 @@ static void OPC_ProcPredefs (OPT_Object obj, INT8 vis)
 	}
 }
 
-static void OPC_Include (CHAR *name, LONGINT name__len)
+static void OPC_Include (CHAR *name, ADDRESS name__len)
 {
 	__DUP(name, name__len, CHAR);
 	OPM_WriteString((CHAR*)"#include ", 10);
@@ -1744,7 +1744,7 @@ static void OPC_CharacterLiteral (INT64 c)
 	}
 }
 
-static void OPC_StringLiteral (CHAR *s, LONGINT s__len, INT32 l)
+static void OPC_StringLiteral (CHAR *s, ADDRESS s__len, INT32 l)
 {
 	INT32 i;
 	INT16 c;
@@ -1912,9 +1912,9 @@ static struct InitKeywords__46 {
 	struct InitKeywords__46 *lnk;
 } *InitKeywords__46_s;
 
-static void Enter__47 (CHAR *s, LONGINT s__len);
+static void Enter__47 (CHAR *s, ADDRESS s__len);
 
-static void Enter__47 (CHAR *s, LONGINT s__len)
+static void Enter__47 (CHAR *s, ADDRESS s__len)
 {
 	INT16 h;
 	__DUP(s, s__len, CHAR);
diff --git a/bootstrap/unix-88/OPC.h b/bootstrap/unix-88/OPC.h
index 842e7dec..5624314d 100644
--- a/bootstrap/unix-88/OPC.h
+++ b/bootstrap/unix-88/OPC.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef OPC__h
 #define OPC__h
diff --git a/bootstrap/unix-88/OPM.c b/bootstrap/unix-88/OPM.c
index 60ab38c7..b2fd5536 100644
--- a/bootstrap/unix-88/OPM.c
+++ b/bootstrap/unix-88/OPM.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
@@ -53,26 +53,26 @@ export void OPM_FPrintLReal (INT32 *fp, LONGREAL val);
 export void OPM_FPrintReal (INT32 *fp, REAL val);
 export void OPM_FPrintSet (INT32 *fp, UINT64 val);
 static void OPM_FindLine (Files_File f, Files_Rider *r, ADDRESS *r__typ, INT64 pos);
-static void OPM_FingerprintBytes (INT32 *fp, SYSTEM_BYTE *bytes, LONGINT bytes__len);
+static void OPM_FingerprintBytes (INT32 *fp, SYSTEM_BYTE *bytes, ADDRESS bytes__len);
 export void OPM_Get (CHAR *ch);
-export void OPM_Init (BOOLEAN *done, CHAR *mname, LONGINT mname__len);
+export void OPM_Init (BOOLEAN *done, CHAR *mname, ADDRESS mname__len);
 export void OPM_InitOptions (void);
 export INT16 OPM_Integer (INT64 n);
 static void OPM_LogErrMsg (INT16 n);
-export void OPM_LogVT100 (CHAR *vt100code, LONGINT vt100code__len);
+export void OPM_LogVT100 (CHAR *vt100code, ADDRESS vt100code__len);
 export void OPM_LogW (CHAR ch);
 export void OPM_LogWLn (void);
 export void OPM_LogWNum (INT64 i, INT64 len);
-export void OPM_LogWStr (CHAR *s, LONGINT s__len);
+export void OPM_LogWStr (CHAR *s, ADDRESS s__len);
 export INT32 OPM_Longint (INT64 n);
-static void OPM_MakeFileName (CHAR *name, LONGINT name__len, CHAR *FName, LONGINT FName__len, CHAR *ext, LONGINT ext__len);
+static void OPM_MakeFileName (CHAR *name, ADDRESS name__len, CHAR *FName, ADDRESS FName__len, CHAR *ext, ADDRESS ext__len);
 export void OPM_Mark (INT16 n, INT32 pos);
-export void OPM_NewSym (CHAR *modName, LONGINT modName__len);
-export void OPM_OldSym (CHAR *modName, LONGINT modName__len, BOOLEAN *done);
-export void OPM_OpenFiles (CHAR *moduleName, LONGINT moduleName__len);
+export void OPM_NewSym (CHAR *modName, ADDRESS modName__len);
+export void OPM_OldSym (CHAR *modName, ADDRESS modName__len, BOOLEAN *done);
+export void OPM_OpenFiles (CHAR *moduleName, ADDRESS moduleName__len);
 export BOOLEAN OPM_OpenPar (void);
 export void OPM_RegisterNewSym (void);
-static void OPM_ScanOptions (CHAR *s, LONGINT s__len);
+static void OPM_ScanOptions (CHAR *s, ADDRESS s__len);
 static void OPM_ShowLine (INT64 pos);
 export INT64 OPM_SignedMaximum (INT32 bytecount);
 export INT64 OPM_SignedMinimum (INT32 bytecount);
@@ -93,8 +93,8 @@ export void OPM_WriteHex (INT64 i);
 export void OPM_WriteInt (INT64 i);
 export void OPM_WriteLn (void);
 export void OPM_WriteReal (LONGREAL r, CHAR suffx);
-export void OPM_WriteString (CHAR *s, LONGINT s__len);
-export void OPM_WriteStringVar (CHAR *s, LONGINT s__len);
+export void OPM_WriteString (CHAR *s, ADDRESS s__len);
+export void OPM_WriteStringVar (CHAR *s, ADDRESS s__len);
 export BOOLEAN OPM_eofSF (void);
 export void OPM_err (INT16 n);
 
@@ -105,7 +105,7 @@ void OPM_LogW (CHAR ch)
 	Out_Char(ch);
 }
 
-void OPM_LogWStr (CHAR *s, LONGINT s__len)
+void OPM_LogWStr (CHAR *s, ADDRESS s__len)
 {
 	__DUP(s, s__len, CHAR);
 	Out_String(s, s__len);
@@ -122,7 +122,7 @@ void OPM_LogWLn (void)
 	Out_Ln();
 }
 
-void OPM_LogVT100 (CHAR *vt100code, LONGINT vt100code__len)
+void OPM_LogVT100 (CHAR *vt100code, ADDRESS vt100code__len)
 {
 	__DUP(vt100code, vt100code__len, CHAR);
 	if ((Out_IsConsole && !__IN(16, OPM_Options, 32))) {
@@ -154,7 +154,7 @@ INT16 OPM_Integer (INT64 n)
 	return __VAL(INT16, n);
 }
 
-static void OPM_ScanOptions (CHAR *s, LONGINT s__len)
+static void OPM_ScanOptions (CHAR *s, ADDRESS s__len)
 {
 	INT16 i;
 	__DUP(s, s__len, CHAR);
@@ -465,7 +465,7 @@ void OPM_InitOptions (void)
 	Files_SetSearchPath(searchpath, 1024);
 }
 
-void OPM_Init (BOOLEAN *done, CHAR *mname, LONGINT mname__len)
+void OPM_Init (BOOLEAN *done, CHAR *mname, ADDRESS mname__len)
 {
 	Texts_Text T = NIL;
 	INT32 beg, end, time;
@@ -514,7 +514,7 @@ void OPM_Get (CHAR *ch)
 	}
 }
 
-static void OPM_MakeFileName (CHAR *name, LONGINT name__len, CHAR *FName, LONGINT FName__len, CHAR *ext, LONGINT ext__len)
+static void OPM_MakeFileName (CHAR *name, ADDRESS name__len, CHAR *FName, ADDRESS FName__len, CHAR *ext, ADDRESS ext__len)
 {
 	INT16 i, j;
 	CHAR ch;
@@ -700,7 +700,7 @@ void OPM_err (INT16 n)
 	OPM_Mark(n, OPM_errpos);
 }
 
-static void OPM_FingerprintBytes (INT32 *fp, SYSTEM_BYTE *bytes, LONGINT bytes__len)
+static void OPM_FingerprintBytes (INT32 *fp, SYSTEM_BYTE *bytes, ADDRESS bytes__len)
 {
 	INT16 i;
 	INT32 l;
@@ -772,7 +772,7 @@ void OPM_CloseOldSym (void)
 	Files_Close(Files_Base(&OPM_oldSF, Files_Rider__typ));
 }
 
-void OPM_OldSym (CHAR *modName, LONGINT modName__len, BOOLEAN *done)
+void OPM_OldSym (CHAR *modName, ADDRESS modName__len, BOOLEAN *done)
 {
 	CHAR tag, ver;
 	OPM_FileName fileName;
@@ -832,7 +832,7 @@ void OPM_DeleteNewSym (void)
 {
 }
 
-void OPM_NewSym (CHAR *modName, LONGINT modName__len)
+void OPM_NewSym (CHAR *modName, ADDRESS modName__len)
 {
 	OPM_FileName fileName;
 	OPM_MakeFileName((void*)modName, modName__len, (void*)fileName, 32, (CHAR*)".sym", 5);
@@ -851,7 +851,7 @@ void OPM_Write (CHAR ch)
 	Files_Write(&OPM_R[__X(OPM_currFile, 3)], Files_Rider__typ, ch);
 }
 
-void OPM_WriteString (CHAR *s, LONGINT s__len)
+void OPM_WriteString (CHAR *s, ADDRESS s__len)
 {
 	INT16 i;
 	i = 0;
@@ -861,7 +861,7 @@ void OPM_WriteString (CHAR *s, LONGINT s__len)
 	Files_WriteBytes(&OPM_R[__X(OPM_currFile, 3)], Files_Rider__typ, (void*)s, s__len * 1, i);
 }
 
-void OPM_WriteStringVar (CHAR *s, LONGINT s__len)
+void OPM_WriteStringVar (CHAR *s, ADDRESS s__len)
 {
 	INT16 i;
 	i = 0;
@@ -986,7 +986,7 @@ static void OPM_Append (Files_Rider *R, ADDRESS *R__typ, Files_File F)
 	}
 }
 
-void OPM_OpenFiles (CHAR *moduleName, LONGINT moduleName__len)
+void OPM_OpenFiles (CHAR *moduleName, ADDRESS moduleName__len)
 {
 	CHAR FName[32];
 	__COPY(moduleName, OPM_modName, 32);
diff --git a/bootstrap/unix-88/OPM.h b/bootstrap/unix-88/OPM.h
index 2d272feb..c310c421 100644
--- a/bootstrap/unix-88/OPM.h
+++ b/bootstrap/unix-88/OPM.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef OPM__h
 #define OPM__h
@@ -28,19 +28,19 @@ import void OPM_FPrintLReal (INT32 *fp, LONGREAL val);
 import void OPM_FPrintReal (INT32 *fp, REAL val);
 import void OPM_FPrintSet (INT32 *fp, UINT64 val);
 import void OPM_Get (CHAR *ch);
-import void OPM_Init (BOOLEAN *done, CHAR *mname, LONGINT mname__len);
+import void OPM_Init (BOOLEAN *done, CHAR *mname, ADDRESS mname__len);
 import void OPM_InitOptions (void);
 import INT16 OPM_Integer (INT64 n);
-import void OPM_LogVT100 (CHAR *vt100code, LONGINT vt100code__len);
+import void OPM_LogVT100 (CHAR *vt100code, ADDRESS vt100code__len);
 import void OPM_LogW (CHAR ch);
 import void OPM_LogWLn (void);
 import void OPM_LogWNum (INT64 i, INT64 len);
-import void OPM_LogWStr (CHAR *s, LONGINT s__len);
+import void OPM_LogWStr (CHAR *s, ADDRESS s__len);
 import INT32 OPM_Longint (INT64 n);
 import void OPM_Mark (INT16 n, INT32 pos);
-import void OPM_NewSym (CHAR *modName, LONGINT modName__len);
-import void OPM_OldSym (CHAR *modName, LONGINT modName__len, BOOLEAN *done);
-import void OPM_OpenFiles (CHAR *moduleName, LONGINT moduleName__len);
+import void OPM_NewSym (CHAR *modName, ADDRESS modName__len);
+import void OPM_OldSym (CHAR *modName, ADDRESS modName__len, BOOLEAN *done);
+import void OPM_OpenFiles (CHAR *moduleName, ADDRESS moduleName__len);
 import BOOLEAN OPM_OpenPar (void);
 import void OPM_RegisterNewSym (void);
 import INT64 OPM_SignedMaximum (INT32 bytecount);
@@ -61,8 +61,8 @@ import void OPM_WriteHex (INT64 i);
 import void OPM_WriteInt (INT64 i);
 import void OPM_WriteLn (void);
 import void OPM_WriteReal (LONGREAL r, CHAR suffx);
-import void OPM_WriteString (CHAR *s, LONGINT s__len);
-import void OPM_WriteStringVar (CHAR *s, LONGINT s__len);
+import void OPM_WriteString (CHAR *s, ADDRESS s__len);
+import void OPM_WriteStringVar (CHAR *s, ADDRESS s__len);
 import BOOLEAN OPM_eofSF (void);
 import void OPM_err (INT16 n);
 import void *OPM__init(void);
diff --git a/bootstrap/unix-88/OPP.c b/bootstrap/unix-88/OPP.c
index df908a43..e6b89be2 100644
--- a/bootstrap/unix-88/OPP.c
+++ b/bootstrap/unix-88/OPP.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/unix-88/OPP.h b/bootstrap/unix-88/OPP.h
index 5a71eb39..acb2df91 100644
--- a/bootstrap/unix-88/OPP.h
+++ b/bootstrap/unix-88/OPP.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef OPP__h
 #define OPP__h
diff --git a/bootstrap/unix-88/OPS.c b/bootstrap/unix-88/OPS.c
index 6ee700e5..7aedbbd6 100644
--- a/bootstrap/unix-88/OPS.c
+++ b/bootstrap/unix-88/OPS.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. tspaSF */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. tspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/unix-88/OPS.h b/bootstrap/unix-88/OPS.h
index 1f7a3e58..e49c222b 100644
--- a/bootstrap/unix-88/OPS.h
+++ b/bootstrap/unix-88/OPS.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. tspaSF */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. tspaSF */
 
 #ifndef OPS__h
 #define OPS__h
diff --git a/bootstrap/unix-88/OPT.c b/bootstrap/unix-88/OPT.c
index a8d42b40..4a900e78 100644
--- a/bootstrap/unix-88/OPT.c
+++ b/bootstrap/unix-88/OPT.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
@@ -120,7 +120,7 @@ static void OPT_EnterTyp (OPS_Name name, INT8 form, INT16 size, OPT_Struct *res)
 static void OPT_EnterTypeAlias (OPS_Name name, OPT_Object *res);
 export void OPT_Export (BOOLEAN *ext, BOOLEAN *new);
 export void OPT_FPrintErr (OPT_Object obj, INT16 errcode);
-static void OPT_FPrintName (INT32 *fp, CHAR *name, LONGINT name__len);
+static void OPT_FPrintName (INT32 *fp, CHAR *name, ADDRESS name__len);
 export void OPT_FPrintObj (OPT_Object obj);
 static void OPT_FPrintSign (INT32 *fp, OPT_Struct result, OPT_Object par);
 export void OPT_FPrintStr (OPT_Struct typ);
@@ -132,7 +132,7 @@ export void OPT_Import (OPS_Name aliasName, OPS_Name name, BOOLEAN *done);
 static void OPT_InConstant (INT32 f, OPT_Const conval);
 static OPT_Object OPT_InFld (void);
 static void OPT_InMod (INT8 *mno);
-static void OPT_InName (CHAR *name, LONGINT name__len);
+static void OPT_InName (CHAR *name, ADDRESS name__len);
 static OPT_Object OPT_InObj (INT8 mno);
 static void OPT_InSign (INT8 mno, OPT_Struct *res, OPT_Object *par);
 static void OPT_InStruct (OPT_Struct *typ);
@@ -155,7 +155,7 @@ static void OPT_OutConstant (OPT_Object obj);
 static void OPT_OutFlds (OPT_Object fld, INT32 adr, BOOLEAN visible);
 static void OPT_OutHdFld (OPT_Struct typ, OPT_Object fld, INT32 adr);
 static void OPT_OutMod (INT16 mno);
-static void OPT_OutName (CHAR *name, LONGINT name__len);
+static void OPT_OutName (CHAR *name, ADDRESS name__len);
 static void OPT_OutObj (OPT_Object obj);
 static void OPT_OutSign (OPT_Struct result, OPT_Object par);
 static void OPT_OutStr (OPT_Struct typ);
@@ -576,7 +576,7 @@ void OPT_Insert (OPS_Name name, OPT_Object *obj)
 	*obj = ob1;
 }
 
-static void OPT_FPrintName (INT32 *fp, CHAR *name, LONGINT name__len)
+static void OPT_FPrintName (INT32 *fp, CHAR *name, ADDRESS name__len)
 {
 	INT16 i;
 	CHAR ch;
@@ -957,7 +957,7 @@ void OPT_InsertImport (OPT_Object obj, OPT_Object *root, OPT_Object *old)
 	}
 }
 
-static void OPT_InName (CHAR *name, LONGINT name__len)
+static void OPT_InName (CHAR *name, ADDRESS name__len)
 {
 	INT16 i;
 	CHAR ch;
@@ -1483,7 +1483,7 @@ void OPT_Import (OPS_Name aliasName, OPS_Name name, BOOLEAN *done)
 	}
 }
 
-static void OPT_OutName (CHAR *name, LONGINT name__len)
+static void OPT_OutName (CHAR *name, ADDRESS name__len)
 {
 	INT16 i;
 	CHAR ch;
diff --git a/bootstrap/unix-88/OPT.h b/bootstrap/unix-88/OPT.h
index 90fcacf5..9d34cea9 100644
--- a/bootstrap/unix-88/OPT.h
+++ b/bootstrap/unix-88/OPT.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef OPT__h
 #define OPT__h
diff --git a/bootstrap/unix-88/OPV.c b/bootstrap/unix-88/OPV.c
index 4bd6b3fb..1b610f35 100644
--- a/bootstrap/unix-88/OPV.c
+++ b/bootstrap/unix-88/OPV.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/unix-88/OPV.h b/bootstrap/unix-88/OPV.h
index c4a61586..0f1980ac 100644
--- a/bootstrap/unix-88/OPV.h
+++ b/bootstrap/unix-88/OPV.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef OPV__h
 #define OPV__h
diff --git a/bootstrap/unix-88/Out.c b/bootstrap/unix-88/Out.c
index 39f383cf..82ad945b 100644
--- a/bootstrap/unix-88/Out.c
+++ b/bootstrap/unix-88/Out.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
@@ -17,16 +17,16 @@ static INT16 Out_in;
 export void Out_Char (CHAR ch);
 export void Out_Flush (void);
 export void Out_Int (INT64 x, INT64 n);
-static INT32 Out_Length (CHAR *s, LONGINT s__len);
+static INT32 Out_Length (CHAR *s, ADDRESS s__len);
 export void Out_Ln (void);
 export void Out_LongReal (LONGREAL x, INT16 n);
 export void Out_Open (void);
 export void Out_Real (REAL x, INT16 n);
 static void Out_RealP (LONGREAL x, INT16 n, BOOLEAN long_);
-export void Out_String (CHAR *str, LONGINT str__len);
+export void Out_String (CHAR *str, ADDRESS str__len);
 export LONGREAL Out_Ten (INT16 e);
-static void Out_digit (INT64 n, CHAR *s, LONGINT s__len, INT16 *i);
-static void Out_prepend (CHAR *t, LONGINT t__len, CHAR *s, LONGINT s__len, INT16 *i);
+static void Out_digit (INT64 n, CHAR *s, ADDRESS s__len, INT16 *i);
+static void Out_prepend (CHAR *t, ADDRESS t__len, CHAR *s, ADDRESS s__len, INT16 *i);
 
 #define Out_Entier64(x)	(INT64)(x)
 
@@ -55,7 +55,7 @@ void Out_Char (CHAR ch)
 	}
 }
 
-static INT32 Out_Length (CHAR *s, LONGINT s__len)
+static INT32 Out_Length (CHAR *s, ADDRESS s__len)
 {
 	INT32 l;
 	l = 0;
@@ -65,7 +65,7 @@ static INT32 Out_Length (CHAR *s, LONGINT s__len)
 	return l;
 }
 
-void Out_String (CHAR *str, LONGINT str__len)
+void Out_String (CHAR *str, ADDRESS str__len)
 {
 	INT32 l;
 	INT16 error;
@@ -125,13 +125,13 @@ void Out_Ln (void)
 	Out_Flush();
 }
 
-static void Out_digit (INT64 n, CHAR *s, LONGINT s__len, INT16 *i)
+static void Out_digit (INT64 n, CHAR *s, ADDRESS s__len, INT16 *i)
 {
 	*i -= 1;
 	s[__X(*i, s__len)] = (CHAR)(__MOD(n, 10) + 48);
 }
 
-static void Out_prepend (CHAR *t, LONGINT t__len, CHAR *s, LONGINT s__len, INT16 *i)
+static void Out_prepend (CHAR *t, ADDRESS t__len, CHAR *s, ADDRESS s__len, INT16 *i)
 {
 	INT16 j;
 	INT32 l;
diff --git a/bootstrap/unix-88/Out.h b/bootstrap/unix-88/Out.h
index 0e66420d..d58a17d5 100644
--- a/bootstrap/unix-88/Out.h
+++ b/bootstrap/unix-88/Out.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef Out__h
 #define Out__h
@@ -16,7 +16,7 @@ import void Out_Ln (void);
 import void Out_LongReal (LONGREAL x, INT16 n);
 import void Out_Open (void);
 import void Out_Real (REAL x, INT16 n);
-import void Out_String (CHAR *str, LONGINT str__len);
+import void Out_String (CHAR *str, ADDRESS str__len);
 import LONGREAL Out_Ten (INT16 e);
 import void *Out__init(void);
 
diff --git a/bootstrap/unix-88/Platform.c b/bootstrap/unix-88/Platform.c
index 46e18441..543ed88a 100644
--- a/bootstrap/unix-88/Platform.c
+++ b/bootstrap/unix-88/Platform.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
@@ -45,35 +45,35 @@ export CHAR Platform_NL[3];
 export ADDRESS *Platform_FileIdentity__typ;
 
 export BOOLEAN Platform_Absent (INT16 e);
-export INT16 Platform_ArgPos (CHAR *s, LONGINT s__len);
-export INT16 Platform_Chdir (CHAR *n, LONGINT n__len);
+export INT16 Platform_ArgPos (CHAR *s, ADDRESS s__len);
+export INT16 Platform_Chdir (CHAR *n, ADDRESS n__len);
 export INT16 Platform_Close (INT32 h);
 export BOOLEAN Platform_ConnectionFailed (INT16 e);
 export void Platform_Delay (INT32 ms);
 export BOOLEAN Platform_DifferentFilesystems (INT16 e);
 export INT16 Platform_Error (void);
 export void Platform_Exit (INT32 code);
-export void Platform_GetArg (INT16 n, CHAR *val, LONGINT val__len);
+export void Platform_GetArg (INT16 n, CHAR *val, ADDRESS val__len);
 export void Platform_GetClock (INT32 *t, INT32 *d);
-export void Platform_GetEnv (CHAR *var, LONGINT var__len, CHAR *val, LONGINT val__len);
+export void Platform_GetEnv (CHAR *var, ADDRESS var__len, CHAR *val, ADDRESS val__len);
 export void Platform_GetIntArg (INT16 n, INT32 *val);
 export void Platform_GetTimeOfDay (INT32 *sec, INT32 *usec);
 export INT16 Platform_Identify (INT32 h, Platform_FileIdentity *identity, ADDRESS *identity__typ);
-export INT16 Platform_IdentifyByName (CHAR *n, LONGINT n__len, Platform_FileIdentity *identity, ADDRESS *identity__typ);
+export INT16 Platform_IdentifyByName (CHAR *n, ADDRESS n__len, Platform_FileIdentity *identity, ADDRESS *identity__typ);
 export BOOLEAN Platform_Inaccessible (INT16 e);
 export void Platform_Init (INT32 argc, INT64 argvadr);
 export BOOLEAN Platform_Interrupted (INT16 e);
 export BOOLEAN Platform_IsConsole (INT32 h);
 export void Platform_MTimeAsClock (Platform_FileIdentity i, INT32 *t, INT32 *d);
-export INT16 Platform_New (CHAR *n, LONGINT n__len, INT32 *h);
+export INT16 Platform_New (CHAR *n, ADDRESS n__len, INT32 *h);
 export BOOLEAN Platform_NoSuchDirectory (INT16 e);
 export INT64 Platform_OSAllocate (INT64 size);
 export void Platform_OSFree (INT64 address);
-export INT16 Platform_OldRO (CHAR *n, LONGINT n__len, INT32 *h);
-export INT16 Platform_OldRW (CHAR *n, LONGINT n__len, INT32 *h);
+export INT16 Platform_OldRO (CHAR *n, ADDRESS n__len, INT32 *h);
+export INT16 Platform_OldRW (CHAR *n, ADDRESS n__len, INT32 *h);
 export INT16 Platform_Read (INT32 h, INT64 p, INT32 l, INT32 *n);
-export INT16 Platform_ReadBuf (INT32 h, SYSTEM_BYTE *b, LONGINT b__len, INT32 *n);
-export INT16 Platform_Rename (CHAR *o, LONGINT o__len, CHAR *n, LONGINT n__len);
+export INT16 Platform_ReadBuf (INT32 h, SYSTEM_BYTE *b, ADDRESS b__len, INT32 *n);
+export INT16 Platform_Rename (CHAR *o, ADDRESS o__len, CHAR *n, ADDRESS n__len);
 export BOOLEAN Platform_SameFile (Platform_FileIdentity i1, Platform_FileIdentity i2);
 export BOOLEAN Platform_SameFileTime (Platform_FileIdentity i1, Platform_FileIdentity i2);
 export INT16 Platform_Seek (INT32 h, INT32 offset, INT16 whence);
@@ -83,16 +83,16 @@ export void Platform_SetMTime (Platform_FileIdentity *target, ADDRESS *target__t
 export void Platform_SetQuitHandler (Platform_SignalHandler handler);
 export INT16 Platform_Size (INT32 h, INT32 *l);
 export INT16 Platform_Sync (INT32 h);
-export INT16 Platform_System (CHAR *cmd, LONGINT cmd__len);
+export INT16 Platform_System (CHAR *cmd, ADDRESS cmd__len);
 static void Platform_TestLittleEndian (void);
 export INT32 Platform_Time (void);
 export BOOLEAN Platform_TimedOut (INT16 e);
 export BOOLEAN Platform_TooManyFiles (INT16 e);
 export INT16 Platform_Truncate (INT32 h, INT32 l);
-export INT16 Platform_Unlink (CHAR *n, LONGINT n__len);
+export INT16 Platform_Unlink (CHAR *n, ADDRESS n__len);
 export INT16 Platform_Write (INT32 h, INT64 p, INT32 l);
 static void Platform_YMDHMStoClock (INT32 ye, INT32 mo, INT32 da, INT32 ho, INT32 mi, INT32 se, INT32 *t, INT32 *d);
-export BOOLEAN Platform_getEnv (CHAR *var, LONGINT var__len, CHAR *val, LONGINT val__len);
+export BOOLEAN Platform_getEnv (CHAR *var, ADDRESS var__len, CHAR *val, ADDRESS val__len);
 
 #include <errno.h>
 #include <errno.h>
@@ -223,7 +223,7 @@ void Platform_Init (INT32 argc, INT64 argvadr)
 	Platform_HeapInitHeap();
 }
 
-BOOLEAN Platform_getEnv (CHAR *var, LONGINT var__len, CHAR *val, LONGINT val__len)
+BOOLEAN Platform_getEnv (CHAR *var, ADDRESS var__len, CHAR *val, ADDRESS val__len)
 {
 	Platform_EnvPtr p = NIL;
 	__DUP(var, var__len, CHAR);
@@ -235,7 +235,7 @@ BOOLEAN Platform_getEnv (CHAR *var, LONGINT var__len, CHAR *val, LONGINT val__le
 	return p != NIL;
 }
 
-void Platform_GetEnv (CHAR *var, LONGINT var__len, CHAR *val, LONGINT val__len)
+void Platform_GetEnv (CHAR *var, ADDRESS var__len, CHAR *val, ADDRESS val__len)
 {
 	__DUP(var, var__len, CHAR);
 	if (!Platform_getEnv(var, var__len, (void*)val, val__len)) {
@@ -244,7 +244,7 @@ void Platform_GetEnv (CHAR *var, LONGINT var__len, CHAR *val, LONGINT val__len)
 	__DEL(var);
 }
 
-void Platform_GetArg (INT16 n, CHAR *val, LONGINT val__len)
+void Platform_GetArg (INT16 n, CHAR *val, ADDRESS val__len)
 {
 	Platform_ArgVec av = NIL;
 	if (n < Platform_ArgCount) {
@@ -279,7 +279,7 @@ void Platform_GetIntArg (INT16 n, INT32 *val)
 	}
 }
 
-INT16 Platform_ArgPos (CHAR *s, LONGINT s__len)
+INT16 Platform_ArgPos (CHAR *s, ADDRESS s__len)
 {
 	INT16 i;
 	CHAR arg[256];
@@ -345,7 +345,7 @@ void Platform_Delay (INT32 ms)
 	Platform_nanosleep(s, ns);
 }
 
-INT16 Platform_System (CHAR *cmd, LONGINT cmd__len)
+INT16 Platform_System (CHAR *cmd, ADDRESS cmd__len)
 {
 	__DUP(cmd, cmd__len, CHAR);
 	__DEL(cmd);
@@ -357,7 +357,7 @@ INT16 Platform_Error (void)
 	return Platform_err();
 }
 
-INT16 Platform_OldRO (CHAR *n, LONGINT n__len, INT32 *h)
+INT16 Platform_OldRO (CHAR *n, ADDRESS n__len, INT32 *h)
 {
 	INT16 fd;
 	fd = Platform_openro(n, n__len);
@@ -370,7 +370,7 @@ INT16 Platform_OldRO (CHAR *n, LONGINT n__len, INT32 *h)
 	__RETCHK;
 }
 
-INT16 Platform_OldRW (CHAR *n, LONGINT n__len, INT32 *h)
+INT16 Platform_OldRW (CHAR *n, ADDRESS n__len, INT32 *h)
 {
 	INT16 fd;
 	fd = Platform_openrw(n, n__len);
@@ -383,7 +383,7 @@ INT16 Platform_OldRW (CHAR *n, LONGINT n__len, INT32 *h)
 	__RETCHK;
 }
 
-INT16 Platform_New (CHAR *n, LONGINT n__len, INT32 *h)
+INT16 Platform_New (CHAR *n, ADDRESS n__len, INT32 *h)
 {
 	INT16 fd;
 	fd = Platform_opennew(n, n__len);
@@ -423,7 +423,7 @@ INT16 Platform_Identify (INT32 h, Platform_FileIdentity *identity, ADDRESS *iden
 	return 0;
 }
 
-INT16 Platform_IdentifyByName (CHAR *n, LONGINT n__len, Platform_FileIdentity *identity, ADDRESS *identity__typ)
+INT16 Platform_IdentifyByName (CHAR *n, ADDRESS n__len, Platform_FileIdentity *identity, ADDRESS *identity__typ)
 {
 	__DUP(n, n__len, CHAR);
 	Platform_structstats();
@@ -481,7 +481,7 @@ INT16 Platform_Read (INT32 h, INT64 p, INT32 l, INT32 *n)
 	__RETCHK;
 }
 
-INT16 Platform_ReadBuf (INT32 h, SYSTEM_BYTE *b, LONGINT b__len, INT32 *n)
+INT16 Platform_ReadBuf (INT32 h, SYSTEM_BYTE *b, ADDRESS b__len, INT32 *n)
 {
 	*n = Platform_readfile(h, (ADDRESS)b, b__len);
 	if (*n < 0) {
@@ -535,7 +535,7 @@ INT16 Platform_Truncate (INT32 h, INT32 l)
 	__RETCHK;
 }
 
-INT16 Platform_Unlink (CHAR *n, LONGINT n__len)
+INT16 Platform_Unlink (CHAR *n, ADDRESS n__len)
 {
 	if (Platform_unlink(n, n__len) < 0) {
 		return Platform_err();
@@ -545,7 +545,7 @@ INT16 Platform_Unlink (CHAR *n, LONGINT n__len)
 	__RETCHK;
 }
 
-INT16 Platform_Chdir (CHAR *n, LONGINT n__len)
+INT16 Platform_Chdir (CHAR *n, ADDRESS n__len)
 {
 	INT16 r;
 	if ((Platform_chdir(n, n__len) >= 0 && Platform_getcwd((void*)Platform_CWD, 256) != NIL)) {
@@ -556,7 +556,7 @@ INT16 Platform_Chdir (CHAR *n, LONGINT n__len)
 	__RETCHK;
 }
 
-INT16 Platform_Rename (CHAR *o, LONGINT o__len, CHAR *n, LONGINT n__len)
+INT16 Platform_Rename (CHAR *o, ADDRESS o__len, CHAR *n, ADDRESS n__len)
 {
 	if (Platform_rename(o, o__len, n, n__len) < 0) {
 		return Platform_err();
diff --git a/bootstrap/unix-88/Platform.h b/bootstrap/unix-88/Platform.h
index 80307386..bfe37a2c 100644
--- a/bootstrap/unix-88/Platform.h
+++ b/bootstrap/unix-88/Platform.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef Platform__h
 #define Platform__h
@@ -27,35 +27,35 @@ import CHAR Platform_NL[3];
 import ADDRESS *Platform_FileIdentity__typ;
 
 import BOOLEAN Platform_Absent (INT16 e);
-import INT16 Platform_ArgPos (CHAR *s, LONGINT s__len);
-import INT16 Platform_Chdir (CHAR *n, LONGINT n__len);
+import INT16 Platform_ArgPos (CHAR *s, ADDRESS s__len);
+import INT16 Platform_Chdir (CHAR *n, ADDRESS n__len);
 import INT16 Platform_Close (INT32 h);
 import BOOLEAN Platform_ConnectionFailed (INT16 e);
 import void Platform_Delay (INT32 ms);
 import BOOLEAN Platform_DifferentFilesystems (INT16 e);
 import INT16 Platform_Error (void);
 import void Platform_Exit (INT32 code);
-import void Platform_GetArg (INT16 n, CHAR *val, LONGINT val__len);
+import void Platform_GetArg (INT16 n, CHAR *val, ADDRESS val__len);
 import void Platform_GetClock (INT32 *t, INT32 *d);
-import void Platform_GetEnv (CHAR *var, LONGINT var__len, CHAR *val, LONGINT val__len);
+import void Platform_GetEnv (CHAR *var, ADDRESS var__len, CHAR *val, ADDRESS val__len);
 import void Platform_GetIntArg (INT16 n, INT32 *val);
 import void Platform_GetTimeOfDay (INT32 *sec, INT32 *usec);
 import INT16 Platform_Identify (INT32 h, Platform_FileIdentity *identity, ADDRESS *identity__typ);
-import INT16 Platform_IdentifyByName (CHAR *n, LONGINT n__len, Platform_FileIdentity *identity, ADDRESS *identity__typ);
+import INT16 Platform_IdentifyByName (CHAR *n, ADDRESS n__len, Platform_FileIdentity *identity, ADDRESS *identity__typ);
 import BOOLEAN Platform_Inaccessible (INT16 e);
 import void Platform_Init (INT32 argc, INT64 argvadr);
 import BOOLEAN Platform_Interrupted (INT16 e);
 import BOOLEAN Platform_IsConsole (INT32 h);
 import void Platform_MTimeAsClock (Platform_FileIdentity i, INT32 *t, INT32 *d);
-import INT16 Platform_New (CHAR *n, LONGINT n__len, INT32 *h);
+import INT16 Platform_New (CHAR *n, ADDRESS n__len, INT32 *h);
 import BOOLEAN Platform_NoSuchDirectory (INT16 e);
 import INT64 Platform_OSAllocate (INT64 size);
 import void Platform_OSFree (INT64 address);
-import INT16 Platform_OldRO (CHAR *n, LONGINT n__len, INT32 *h);
-import INT16 Platform_OldRW (CHAR *n, LONGINT n__len, INT32 *h);
+import INT16 Platform_OldRO (CHAR *n, ADDRESS n__len, INT32 *h);
+import INT16 Platform_OldRW (CHAR *n, ADDRESS n__len, INT32 *h);
 import INT16 Platform_Read (INT32 h, INT64 p, INT32 l, INT32 *n);
-import INT16 Platform_ReadBuf (INT32 h, SYSTEM_BYTE *b, LONGINT b__len, INT32 *n);
-import INT16 Platform_Rename (CHAR *o, LONGINT o__len, CHAR *n, LONGINT n__len);
+import INT16 Platform_ReadBuf (INT32 h, SYSTEM_BYTE *b, ADDRESS b__len, INT32 *n);
+import INT16 Platform_Rename (CHAR *o, ADDRESS o__len, CHAR *n, ADDRESS n__len);
 import BOOLEAN Platform_SameFile (Platform_FileIdentity i1, Platform_FileIdentity i2);
 import BOOLEAN Platform_SameFileTime (Platform_FileIdentity i1, Platform_FileIdentity i2);
 import INT16 Platform_Seek (INT32 h, INT32 offset, INT16 whence);
@@ -65,14 +65,14 @@ import void Platform_SetMTime (Platform_FileIdentity *target, ADDRESS *target__t
 import void Platform_SetQuitHandler (Platform_SignalHandler handler);
 import INT16 Platform_Size (INT32 h, INT32 *l);
 import INT16 Platform_Sync (INT32 h);
-import INT16 Platform_System (CHAR *cmd, LONGINT cmd__len);
+import INT16 Platform_System (CHAR *cmd, ADDRESS cmd__len);
 import INT32 Platform_Time (void);
 import BOOLEAN Platform_TimedOut (INT16 e);
 import BOOLEAN Platform_TooManyFiles (INT16 e);
 import INT16 Platform_Truncate (INT32 h, INT32 l);
-import INT16 Platform_Unlink (CHAR *n, LONGINT n__len);
+import INT16 Platform_Unlink (CHAR *n, ADDRESS n__len);
 import INT16 Platform_Write (INT32 h, INT64 p, INT32 l);
-import BOOLEAN Platform_getEnv (CHAR *var, LONGINT var__len, CHAR *val, LONGINT val__len);
+import BOOLEAN Platform_getEnv (CHAR *var, ADDRESS var__len, CHAR *val, ADDRESS val__len);
 import void *Platform__init(void);
 
 
diff --git a/bootstrap/unix-88/Reals.c b/bootstrap/unix-88/Reals.c
index cd4c3c61..be3ad909 100644
--- a/bootstrap/unix-88/Reals.c
+++ b/bootstrap/unix-88/Reals.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
@@ -10,11 +10,11 @@
 
 
 
-static void Reals_BytesToHex (SYSTEM_BYTE *b, LONGINT b__len, SYSTEM_BYTE *d, LONGINT d__len);
-export void Reals_Convert (REAL x, INT16 n, CHAR *d, LONGINT d__len);
-export void Reals_ConvertH (REAL y, CHAR *d, LONGINT d__len);
-export void Reals_ConvertHL (LONGREAL x, CHAR *d, LONGINT d__len);
-export void Reals_ConvertL (LONGREAL x, INT16 n, CHAR *d, LONGINT d__len);
+static void Reals_BytesToHex (SYSTEM_BYTE *b, ADDRESS b__len, SYSTEM_BYTE *d, ADDRESS d__len);
+export void Reals_Convert (REAL x, INT16 n, CHAR *d, ADDRESS d__len);
+export void Reals_ConvertH (REAL y, CHAR *d, ADDRESS d__len);
+export void Reals_ConvertHL (LONGREAL x, CHAR *d, ADDRESS d__len);
+export void Reals_ConvertL (LONGREAL x, INT16 n, CHAR *d, ADDRESS d__len);
 export INT16 Reals_Expo (REAL x);
 export INT16 Reals_ExpoL (LONGREAL x);
 export void Reals_SetExpo (REAL *x, INT16 ex);
@@ -79,7 +79,7 @@ INT16 Reals_ExpoL (LONGREAL x)
 	return __MASK(__ASHR(i, 4), -2048);
 }
 
-void Reals_ConvertL (LONGREAL x, INT16 n, CHAR *d, LONGINT d__len)
+void Reals_ConvertL (LONGREAL x, INT16 n, CHAR *d, ADDRESS d__len)
 {
 	INT32 i, j, k;
 	if (x < (LONGREAL)0) {
@@ -107,7 +107,7 @@ void Reals_ConvertL (LONGREAL x, INT16 n, CHAR *d, LONGINT d__len)
 	}
 }
 
-void Reals_Convert (REAL x, INT16 n, CHAR *d, LONGINT d__len)
+void Reals_Convert (REAL x, INT16 n, CHAR *d, ADDRESS d__len)
 {
 	Reals_ConvertL(x, n, (void*)d, d__len);
 }
@@ -122,7 +122,7 @@ static CHAR Reals_ToHex (INT16 i)
 	__RETCHK;
 }
 
-static void Reals_BytesToHex (SYSTEM_BYTE *b, LONGINT b__len, SYSTEM_BYTE *d, LONGINT d__len)
+static void Reals_BytesToHex (SYSTEM_BYTE *b, ADDRESS b__len, SYSTEM_BYTE *d, ADDRESS d__len)
 {
 	INT16 i;
 	INT32 l;
@@ -137,12 +137,12 @@ static void Reals_BytesToHex (SYSTEM_BYTE *b, LONGINT b__len, SYSTEM_BYTE *d, LO
 	}
 }
 
-void Reals_ConvertH (REAL y, CHAR *d, LONGINT d__len)
+void Reals_ConvertH (REAL y, CHAR *d, ADDRESS d__len)
 {
 	Reals_BytesToHex((void*)&y, 4, (void*)d, d__len * 1);
 }
 
-void Reals_ConvertHL (LONGREAL x, CHAR *d, LONGINT d__len)
+void Reals_ConvertHL (LONGREAL x, CHAR *d, ADDRESS d__len)
 {
 	Reals_BytesToHex((void*)&x, 8, (void*)d, d__len * 1);
 }
diff --git a/bootstrap/unix-88/Reals.h b/bootstrap/unix-88/Reals.h
index f0c84ab1..e8d15a2f 100644
--- a/bootstrap/unix-88/Reals.h
+++ b/bootstrap/unix-88/Reals.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef Reals__h
 #define Reals__h
@@ -8,10 +8,10 @@
 
 
 
-import void Reals_Convert (REAL x, INT16 n, CHAR *d, LONGINT d__len);
-import void Reals_ConvertH (REAL y, CHAR *d, LONGINT d__len);
-import void Reals_ConvertHL (LONGREAL x, CHAR *d, LONGINT d__len);
-import void Reals_ConvertL (LONGREAL x, INT16 n, CHAR *d, LONGINT d__len);
+import void Reals_Convert (REAL x, INT16 n, CHAR *d, ADDRESS d__len);
+import void Reals_ConvertH (REAL y, CHAR *d, ADDRESS d__len);
+import void Reals_ConvertHL (LONGREAL x, CHAR *d, ADDRESS d__len);
+import void Reals_ConvertL (LONGREAL x, INT16 n, CHAR *d, ADDRESS d__len);
 import INT16 Reals_Expo (REAL x);
 import INT16 Reals_ExpoL (LONGREAL x);
 import void Reals_SetExpo (REAL *x, INT16 ex);
diff --git a/bootstrap/unix-88/Strings.c b/bootstrap/unix-88/Strings.c
index b5707327..fd550df3 100644
--- a/bootstrap/unix-88/Strings.c
+++ b/bootstrap/unix-88/Strings.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
@@ -10,18 +10,18 @@
 
 
 
-export void Strings_Append (CHAR *extra, LONGINT extra__len, CHAR *dest, LONGINT dest__len);
-export void Strings_Cap (CHAR *s, LONGINT s__len);
-export void Strings_Delete (CHAR *s, LONGINT s__len, INT16 pos, INT16 n);
-export void Strings_Extract (CHAR *source, LONGINT source__len, INT16 pos, INT16 n, CHAR *dest, LONGINT dest__len);
-export void Strings_Insert (CHAR *source, LONGINT source__len, INT16 pos, CHAR *dest, LONGINT dest__len);
-export INT16 Strings_Length (CHAR *s, LONGINT s__len);
-export BOOLEAN Strings_Match (CHAR *string, LONGINT string__len, CHAR *pattern, LONGINT pattern__len);
-export INT16 Strings_Pos (CHAR *pattern, LONGINT pattern__len, CHAR *s, LONGINT s__len, INT16 pos);
-export void Strings_Replace (CHAR *source, LONGINT source__len, INT16 pos, CHAR *dest, LONGINT dest__len);
+export void Strings_Append (CHAR *extra, ADDRESS extra__len, CHAR *dest, ADDRESS dest__len);
+export void Strings_Cap (CHAR *s, ADDRESS s__len);
+export void Strings_Delete (CHAR *s, ADDRESS s__len, INT16 pos, INT16 n);
+export void Strings_Extract (CHAR *source, ADDRESS source__len, INT16 pos, INT16 n, CHAR *dest, ADDRESS dest__len);
+export void Strings_Insert (CHAR *source, ADDRESS source__len, INT16 pos, CHAR *dest, ADDRESS dest__len);
+export INT16 Strings_Length (CHAR *s, ADDRESS s__len);
+export BOOLEAN Strings_Match (CHAR *string, ADDRESS string__len, CHAR *pattern, ADDRESS pattern__len);
+export INT16 Strings_Pos (CHAR *pattern, ADDRESS pattern__len, CHAR *s, ADDRESS s__len, INT16 pos);
+export void Strings_Replace (CHAR *source, ADDRESS source__len, INT16 pos, CHAR *dest, ADDRESS dest__len);
 
 
-INT16 Strings_Length (CHAR *s, LONGINT s__len)
+INT16 Strings_Length (CHAR *s, ADDRESS s__len)
 {
 	INT32 i;
 	__DUP(s, s__len, CHAR);
@@ -39,7 +39,7 @@ INT16 Strings_Length (CHAR *s, LONGINT s__len)
 	__RETCHK;
 }
 
-void Strings_Append (CHAR *extra, LONGINT extra__len, CHAR *dest, LONGINT dest__len)
+void Strings_Append (CHAR *extra, ADDRESS extra__len, CHAR *dest, ADDRESS dest__len)
 {
 	INT16 n1, n2, i;
 	__DUP(extra, extra__len, CHAR);
@@ -56,7 +56,7 @@ void Strings_Append (CHAR *extra, LONGINT extra__len, CHAR *dest, LONGINT dest__
 	__DEL(extra);
 }
 
-void Strings_Insert (CHAR *source, LONGINT source__len, INT16 pos, CHAR *dest, LONGINT dest__len)
+void Strings_Insert (CHAR *source, ADDRESS source__len, INT16 pos, CHAR *dest, ADDRESS dest__len)
 {
 	INT16 n1, n2, i;
 	__DUP(source, source__len, CHAR);
@@ -87,7 +87,7 @@ void Strings_Insert (CHAR *source, LONGINT source__len, INT16 pos, CHAR *dest, L
 	__DEL(source);
 }
 
-void Strings_Delete (CHAR *s, LONGINT s__len, INT16 pos, INT16 n)
+void Strings_Delete (CHAR *s, ADDRESS s__len, INT16 pos, INT16 n)
 {
 	INT16 len, i;
 	len = Strings_Length(s, s__len);
@@ -110,7 +110,7 @@ void Strings_Delete (CHAR *s, LONGINT s__len, INT16 pos, INT16 n)
 	}
 }
 
-void Strings_Replace (CHAR *source, LONGINT source__len, INT16 pos, CHAR *dest, LONGINT dest__len)
+void Strings_Replace (CHAR *source, ADDRESS source__len, INT16 pos, CHAR *dest, ADDRESS dest__len)
 {
 	__DUP(source, source__len, CHAR);
 	Strings_Delete((void*)dest, dest__len, pos, pos + Strings_Length(source, source__len));
@@ -118,7 +118,7 @@ void Strings_Replace (CHAR *source, LONGINT source__len, INT16 pos, CHAR *dest,
 	__DEL(source);
 }
 
-void Strings_Extract (CHAR *source, LONGINT source__len, INT16 pos, INT16 n, CHAR *dest, LONGINT dest__len)
+void Strings_Extract (CHAR *source, ADDRESS source__len, INT16 pos, INT16 n, CHAR *dest, ADDRESS dest__len)
 {
 	INT16 len, destLen, i;
 	__DUP(source, source__len, CHAR);
@@ -143,7 +143,7 @@ void Strings_Extract (CHAR *source, LONGINT source__len, INT16 pos, INT16 n, CHA
 	__DEL(source);
 }
 
-INT16 Strings_Pos (CHAR *pattern, LONGINT pattern__len, CHAR *s, LONGINT s__len, INT16 pos)
+INT16 Strings_Pos (CHAR *pattern, ADDRESS pattern__len, CHAR *s, ADDRESS s__len, INT16 pos)
 {
 	INT16 n1, n2, i, j;
 	__DUP(pattern, pattern__len, CHAR);
@@ -175,7 +175,7 @@ INT16 Strings_Pos (CHAR *pattern, LONGINT pattern__len, CHAR *s, LONGINT s__len,
 	return -1;
 }
 
-void Strings_Cap (CHAR *s, LONGINT s__len)
+void Strings_Cap (CHAR *s, ADDRESS s__len)
 {
 	INT16 i;
 	i = 0;
@@ -191,9 +191,9 @@ static struct Match__7 {
 	struct Match__7 *lnk;
 } *Match__7_s;
 
-static BOOLEAN M__8 (CHAR *name, LONGINT name__len, CHAR *mask, LONGINT mask__len, INT16 n, INT16 m);
+static BOOLEAN M__8 (CHAR *name, ADDRESS name__len, CHAR *mask, ADDRESS mask__len, INT16 n, INT16 m);
 
-static BOOLEAN M__8 (CHAR *name, LONGINT name__len, CHAR *mask, LONGINT mask__len, INT16 n, INT16 m)
+static BOOLEAN M__8 (CHAR *name, ADDRESS name__len, CHAR *mask, ADDRESS mask__len, INT16 n, INT16 m)
 {
 	while ((((n >= 0 && m >= 0)) && mask[__X(m, mask__len)] != '*')) {
 		if (name[__X(n, name__len)] != mask[__X(m, mask__len)]) {
@@ -220,7 +220,7 @@ static BOOLEAN M__8 (CHAR *name, LONGINT name__len, CHAR *mask, LONGINT mask__le
 	return 0;
 }
 
-BOOLEAN Strings_Match (CHAR *string, LONGINT string__len, CHAR *pattern, LONGINT pattern__len)
+BOOLEAN Strings_Match (CHAR *string, ADDRESS string__len, CHAR *pattern, ADDRESS pattern__len)
 {
 	struct Match__7 _s;
 	BOOLEAN __retval;
diff --git a/bootstrap/unix-88/Strings.h b/bootstrap/unix-88/Strings.h
index c987af8d..76cb022d 100644
--- a/bootstrap/unix-88/Strings.h
+++ b/bootstrap/unix-88/Strings.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef Strings__h
 #define Strings__h
@@ -8,15 +8,15 @@
 
 
 
-import void Strings_Append (CHAR *extra, LONGINT extra__len, CHAR *dest, LONGINT dest__len);
-import void Strings_Cap (CHAR *s, LONGINT s__len);
-import void Strings_Delete (CHAR *s, LONGINT s__len, INT16 pos, INT16 n);
-import void Strings_Extract (CHAR *source, LONGINT source__len, INT16 pos, INT16 n, CHAR *dest, LONGINT dest__len);
-import void Strings_Insert (CHAR *source, LONGINT source__len, INT16 pos, CHAR *dest, LONGINT dest__len);
-import INT16 Strings_Length (CHAR *s, LONGINT s__len);
-import BOOLEAN Strings_Match (CHAR *string, LONGINT string__len, CHAR *pattern, LONGINT pattern__len);
-import INT16 Strings_Pos (CHAR *pattern, LONGINT pattern__len, CHAR *s, LONGINT s__len, INT16 pos);
-import void Strings_Replace (CHAR *source, LONGINT source__len, INT16 pos, CHAR *dest, LONGINT dest__len);
+import void Strings_Append (CHAR *extra, ADDRESS extra__len, CHAR *dest, ADDRESS dest__len);
+import void Strings_Cap (CHAR *s, ADDRESS s__len);
+import void Strings_Delete (CHAR *s, ADDRESS s__len, INT16 pos, INT16 n);
+import void Strings_Extract (CHAR *source, ADDRESS source__len, INT16 pos, INT16 n, CHAR *dest, ADDRESS dest__len);
+import void Strings_Insert (CHAR *source, ADDRESS source__len, INT16 pos, CHAR *dest, ADDRESS dest__len);
+import INT16 Strings_Length (CHAR *s, ADDRESS s__len);
+import BOOLEAN Strings_Match (CHAR *string, ADDRESS string__len, CHAR *pattern, ADDRESS pattern__len);
+import INT16 Strings_Pos (CHAR *pattern, ADDRESS pattern__len, CHAR *s, ADDRESS s__len, INT16 pos);
+import void Strings_Replace (CHAR *source, ADDRESS source__len, INT16 pos, CHAR *dest, ADDRESS dest__len);
 import void *Strings__init(void);
 
 
diff --git a/bootstrap/unix-88/Texts.c b/bootstrap/unix-88/Texts.c
index ae12961b..7182a772 100644
--- a/bootstrap/unix-88/Texts.c
+++ b/bootstrap/unix-88/Texts.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
@@ -187,20 +187,20 @@ export void Texts_Append (Texts_Text T, Texts_Buffer B);
 export void Texts_ChangeLooks (Texts_Text T, INT32 beg, INT32 end, UINT32 sel, Texts_FontsFont fnt, INT8 col, INT8 voff);
 static Texts_Elem Texts_CloneElem (Texts_Elem e);
 static Texts_Piece Texts_ClonePiece (Texts_Piece p);
-export void Texts_Close (Texts_Text T, CHAR *name, LONGINT name__len);
+export void Texts_Close (Texts_Text T, CHAR *name, ADDRESS name__len);
 export void Texts_Copy (Texts_Buffer SB, Texts_Buffer DB);
 export void Texts_CopyElem (Texts_Elem SE, Texts_Elem DE);
 export void Texts_Delete (Texts_Text T, INT32 beg, INT32 end);
 export Texts_Text Texts_ElemBase (Texts_Elem E);
 export INT32 Texts_ElemPos (Texts_Elem E);
 static void Texts_Find (Texts_Text T, INT32 *pos, Texts_Run *u, INT32 *org, INT32 *off);
-static Texts_FontsFont Texts_FontsThis (CHAR *name, LONGINT name__len);
+static Texts_FontsFont Texts_FontsThis (CHAR *name, ADDRESS name__len);
 static void Texts_HandleAlien (Texts_Elem E, Texts_ElemMsg *msg, ADDRESS *msg__typ);
 export void Texts_Insert (Texts_Text T, INT32 pos, Texts_Buffer B);
 export void Texts_Load (Files_Rider *r, ADDRESS *r__typ, Texts_Text T);
 static void Texts_Load0 (Files_Rider *r, ADDRESS *r__typ, Texts_Text T);
 static void Texts_Merge (Texts_Text T, Texts_Run u, Texts_Run *v);
-export void Texts_Open (Texts_Text T, CHAR *name, LONGINT name__len);
+export void Texts_Open (Texts_Text T, CHAR *name, ADDRESS name__len);
 export void Texts_OpenBuf (Texts_Buffer B);
 export void Texts_OpenReader (Texts_Reader *R, ADDRESS *R__typ, Texts_Text T, INT32 pos);
 export void Texts_OpenScanner (Texts_Scanner *S, ADDRESS *S__typ, Texts_Text T, INT32 pos);
@@ -229,10 +229,10 @@ export void Texts_WriteLongRealHex (Texts_Writer *W, ADDRESS *W__typ, LONGREAL x
 export void Texts_WriteReal (Texts_Writer *W, ADDRESS *W__typ, REAL x, INT16 n);
 export void Texts_WriteRealFix (Texts_Writer *W, ADDRESS *W__typ, REAL x, INT16 n, INT16 k);
 export void Texts_WriteRealHex (Texts_Writer *W, ADDRESS *W__typ, REAL x);
-export void Texts_WriteString (Texts_Writer *W, ADDRESS *W__typ, CHAR *s, LONGINT s__len);
+export void Texts_WriteString (Texts_Writer *W, ADDRESS *W__typ, CHAR *s, ADDRESS s__len);
 
 
-static Texts_FontsFont Texts_FontsThis (CHAR *name, LONGINT name__len)
+static Texts_FontsFont Texts_FontsThis (CHAR *name, ADDRESS name__len)
 {
 	Texts_FontsFont F = NIL;
 	__NEW(F, Texts_FontDesc);
@@ -1027,7 +1027,7 @@ void Texts_WriteLn (Texts_Writer *W, ADDRESS *W__typ)
 	Texts_Write(&*W, W__typ, 0x0d);
 }
 
-void Texts_WriteString (Texts_Writer *W, ADDRESS *W__typ, CHAR *s, LONGINT s__len)
+void Texts_WriteString (Texts_Writer *W, ADDRESS *W__typ, CHAR *s, ADDRESS s__len)
 {
 	INT16 i;
 	__DUP(s, s__len, CHAR);
@@ -1539,7 +1539,7 @@ void Texts_Load (Files_Rider *r, ADDRESS *r__typ, Texts_Text T)
 	Texts_Load0(&*r, r__typ, T);
 }
 
-void Texts_Open (Texts_Text T, CHAR *name, LONGINT name__len)
+void Texts_Open (Texts_Text T, CHAR *name, ADDRESS name__len)
 {
 	Files_File f = NIL;
 	Files_Rider r;
@@ -1755,7 +1755,7 @@ void Texts_Store (Files_Rider *r, ADDRESS *r__typ, Texts_Text T)
 	Store__39_s = _s.lnk;
 }
 
-void Texts_Close (Texts_Text T, CHAR *name, LONGINT name__len)
+void Texts_Close (Texts_Text T, CHAR *name, ADDRESS name__len)
 {
 	Files_File f = NIL;
 	Files_Rider r;
diff --git a/bootstrap/unix-88/Texts.h b/bootstrap/unix-88/Texts.h
index 61a97dda..e8735b00 100644
--- a/bootstrap/unix-88/Texts.h
+++ b/bootstrap/unix-88/Texts.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef Texts__h
 #define Texts__h
@@ -131,7 +131,7 @@ import ADDRESS *Texts_Writer__typ;
 
 import void Texts_Append (Texts_Text T, Texts_Buffer B);
 import void Texts_ChangeLooks (Texts_Text T, INT32 beg, INT32 end, UINT32 sel, Texts_FontsFont fnt, INT8 col, INT8 voff);
-import void Texts_Close (Texts_Text T, CHAR *name, LONGINT name__len);
+import void Texts_Close (Texts_Text T, CHAR *name, ADDRESS name__len);
 import void Texts_Copy (Texts_Buffer SB, Texts_Buffer DB);
 import void Texts_CopyElem (Texts_Elem SE, Texts_Elem DE);
 import void Texts_Delete (Texts_Text T, INT32 beg, INT32 end);
@@ -139,7 +139,7 @@ import Texts_Text Texts_ElemBase (Texts_Elem E);
 import INT32 Texts_ElemPos (Texts_Elem E);
 import void Texts_Insert (Texts_Text T, INT32 pos, Texts_Buffer B);
 import void Texts_Load (Files_Rider *r, ADDRESS *r__typ, Texts_Text T);
-import void Texts_Open (Texts_Text T, CHAR *name, LONGINT name__len);
+import void Texts_Open (Texts_Text T, CHAR *name, ADDRESS name__len);
 import void Texts_OpenBuf (Texts_Buffer B);
 import void Texts_OpenReader (Texts_Reader *R, ADDRESS *R__typ, Texts_Text T, INT32 pos);
 import void Texts_OpenScanner (Texts_Scanner *S, ADDRESS *S__typ, Texts_Text T, INT32 pos);
@@ -166,7 +166,7 @@ import void Texts_WriteLongRealHex (Texts_Writer *W, ADDRESS *W__typ, LONGREAL x
 import void Texts_WriteReal (Texts_Writer *W, ADDRESS *W__typ, REAL x, INT16 n);
 import void Texts_WriteRealFix (Texts_Writer *W, ADDRESS *W__typ, REAL x, INT16 n, INT16 k);
 import void Texts_WriteRealHex (Texts_Writer *W, ADDRESS *W__typ, REAL x);
-import void Texts_WriteString (Texts_Writer *W, ADDRESS *W__typ, CHAR *s, LONGINT s__len);
+import void Texts_WriteString (Texts_Writer *W, ADDRESS *W__typ, CHAR *s, ADDRESS s__len);
 import void *Texts__init(void);
 
 
diff --git a/bootstrap/unix-88/VT100.c b/bootstrap/unix-88/VT100.c
index f69fd90e..38c0743f 100644
--- a/bootstrap/unix-88/VT100.c
+++ b/bootstrap/unix-88/VT100.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
@@ -27,23 +27,23 @@ export void VT100_DECTCEMl (void);
 export void VT100_DSR (INT16 n);
 export void VT100_ED (INT16 n);
 export void VT100_EL (INT16 n);
-static void VT100_EscSeq (INT16 n, CHAR *letter, LONGINT letter__len);
-static void VT100_EscSeq0 (CHAR *letter, LONGINT letter__len);
-static void VT100_EscSeq2 (INT16 n, INT16 m, CHAR *letter, LONGINT letter__len);
-static void VT100_EscSeqSwapped (INT16 n, CHAR *letter, LONGINT letter__len);
+static void VT100_EscSeq (INT16 n, CHAR *letter, ADDRESS letter__len);
+static void VT100_EscSeq0 (CHAR *letter, ADDRESS letter__len);
+static void VT100_EscSeq2 (INT16 n, INT16 m, CHAR *letter, ADDRESS letter__len);
+static void VT100_EscSeqSwapped (INT16 n, CHAR *letter, ADDRESS letter__len);
 export void VT100_HVP (INT16 n, INT16 m);
-export void VT100_IntToStr (INT32 int_, CHAR *str, LONGINT str__len);
+export void VT100_IntToStr (INT32 int_, CHAR *str, ADDRESS str__len);
 export void VT100_RCP (void);
-static void VT100_Reverse0 (CHAR *str, LONGINT str__len, INT16 start, INT16 end);
+static void VT100_Reverse0 (CHAR *str, ADDRESS str__len, INT16 start, INT16 end);
 export void VT100_SCP (void);
 export void VT100_SD (INT16 n);
 export void VT100_SGR (INT16 n);
 export void VT100_SGR2 (INT16 n, INT16 m);
 export void VT100_SU (INT16 n);
-export void VT100_SetAttr (CHAR *attr, LONGINT attr__len);
+export void VT100_SetAttr (CHAR *attr, ADDRESS attr__len);
 
 
-static void VT100_Reverse0 (CHAR *str, LONGINT str__len, INT16 start, INT16 end)
+static void VT100_Reverse0 (CHAR *str, ADDRESS str__len, INT16 start, INT16 end)
 {
 	CHAR h;
 	while (start < end) {
@@ -55,7 +55,7 @@ static void VT100_Reverse0 (CHAR *str, LONGINT str__len, INT16 start, INT16 end)
 	}
 }
 
-void VT100_IntToStr (INT32 int_, CHAR *str, LONGINT str__len)
+void VT100_IntToStr (INT32 int_, CHAR *str, ADDRESS str__len)
 {
 	CHAR b[21];
 	INT16 s, e;
@@ -84,7 +84,7 @@ void VT100_IntToStr (INT32 int_, CHAR *str, LONGINT str__len)
 	__COPY(b, str, str__len);
 }
 
-static void VT100_EscSeq0 (CHAR *letter, LONGINT letter__len)
+static void VT100_EscSeq0 (CHAR *letter, ADDRESS letter__len)
 {
 	CHAR cmd[9];
 	__DUP(letter, letter__len, CHAR);
@@ -94,7 +94,7 @@ static void VT100_EscSeq0 (CHAR *letter, LONGINT letter__len)
 	__DEL(letter);
 }
 
-static void VT100_EscSeq (INT16 n, CHAR *letter, LONGINT letter__len)
+static void VT100_EscSeq (INT16 n, CHAR *letter, ADDRESS letter__len)
 {
 	CHAR nstr[2];
 	CHAR cmd[7];
@@ -107,7 +107,7 @@ static void VT100_EscSeq (INT16 n, CHAR *letter, LONGINT letter__len)
 	__DEL(letter);
 }
 
-static void VT100_EscSeqSwapped (INT16 n, CHAR *letter, LONGINT letter__len)
+static void VT100_EscSeqSwapped (INT16 n, CHAR *letter, ADDRESS letter__len)
 {
 	CHAR nstr[2];
 	CHAR cmd[7];
@@ -120,7 +120,7 @@ static void VT100_EscSeqSwapped (INT16 n, CHAR *letter, LONGINT letter__len)
 	__DEL(letter);
 }
 
-static void VT100_EscSeq2 (INT16 n, INT16 m, CHAR *letter, LONGINT letter__len)
+static void VT100_EscSeq2 (INT16 n, INT16 m, CHAR *letter, ADDRESS letter__len)
 {
 	CHAR nstr[5], mstr[5];
 	CHAR cmd[12];
@@ -236,7 +236,7 @@ void VT100_DECTCEMh (void)
 	VT100_EscSeq0((CHAR*)"\?25h", 5);
 }
 
-void VT100_SetAttr (CHAR *attr, LONGINT attr__len)
+void VT100_SetAttr (CHAR *attr, ADDRESS attr__len)
 {
 	CHAR tmpstr[16];
 	__DUP(attr, attr__len, CHAR);
diff --git a/bootstrap/unix-88/VT100.h b/bootstrap/unix-88/VT100.h
index d99406ec..4bbb3110 100644
--- a/bootstrap/unix-88/VT100.h
+++ b/bootstrap/unix-88/VT100.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef VT100__h
 #define VT100__h
@@ -23,14 +23,14 @@ import void VT100_DSR (INT16 n);
 import void VT100_ED (INT16 n);
 import void VT100_EL (INT16 n);
 import void VT100_HVP (INT16 n, INT16 m);
-import void VT100_IntToStr (INT32 int_, CHAR *str, LONGINT str__len);
+import void VT100_IntToStr (INT32 int_, CHAR *str, ADDRESS str__len);
 import void VT100_RCP (void);
 import void VT100_SCP (void);
 import void VT100_SD (INT16 n);
 import void VT100_SGR (INT16 n);
 import void VT100_SGR2 (INT16 n, INT16 m);
 import void VT100_SU (INT16 n);
-import void VT100_SetAttr (CHAR *attr, LONGINT attr__len);
+import void VT100_SetAttr (CHAR *attr, ADDRESS attr__len);
 import void *VT100__init(void);
 
 
diff --git a/bootstrap/unix-88/extTools.c b/bootstrap/unix-88/extTools.c
index 37630d23..66f80319 100644
--- a/bootstrap/unix-88/extTools.c
+++ b/bootstrap/unix-88/extTools.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
@@ -17,13 +17,13 @@
 static CHAR extTools_CFLAGS[1023];
 
 
-export void extTools_Assemble (CHAR *moduleName, LONGINT moduleName__len);
-static void extTools_InitialiseCompilerCommand (CHAR *s, LONGINT s__len);
-export void extTools_LinkMain (CHAR *moduleName, LONGINT moduleName__len, BOOLEAN statically, CHAR *additionalopts, LONGINT additionalopts__len);
-static void extTools_execute (CHAR *title, LONGINT title__len, CHAR *cmd, LONGINT cmd__len);
+export void extTools_Assemble (CHAR *moduleName, ADDRESS moduleName__len);
+static void extTools_InitialiseCompilerCommand (CHAR *s, ADDRESS s__len);
+export void extTools_LinkMain (CHAR *moduleName, ADDRESS moduleName__len, BOOLEAN statically, CHAR *additionalopts, ADDRESS additionalopts__len);
+static void extTools_execute (CHAR *title, ADDRESS title__len, CHAR *cmd, ADDRESS cmd__len);
 
 
-static void extTools_execute (CHAR *title, LONGINT title__len, CHAR *cmd, LONGINT cmd__len)
+static void extTools_execute (CHAR *title, ADDRESS title__len, CHAR *cmd, ADDRESS cmd__len)
 {
 	INT16 r, status, exitcode;
 	__DUP(title, title__len, CHAR);
@@ -63,7 +63,7 @@ static void extTools_execute (CHAR *title, LONGINT title__len, CHAR *cmd, LONGIN
 	__DEL(cmd);
 }
 
-static void extTools_InitialiseCompilerCommand (CHAR *s, LONGINT s__len)
+static void extTools_InitialiseCompilerCommand (CHAR *s, ADDRESS s__len)
 {
 	__COPY("gcc -g", s, s__len);
 	Strings_Append((CHAR*)" -I \"", 6, (void*)s, s__len);
@@ -74,7 +74,7 @@ static void extTools_InitialiseCompilerCommand (CHAR *s, LONGINT s__len)
 	Strings_Append((CHAR*)" ", 2, (void*)s, s__len);
 }
 
-void extTools_Assemble (CHAR *moduleName, LONGINT moduleName__len)
+void extTools_Assemble (CHAR *moduleName, ADDRESS moduleName__len)
 {
 	CHAR cmd[1023];
 	__DUP(moduleName, moduleName__len, CHAR);
@@ -86,7 +86,7 @@ void extTools_Assemble (CHAR *moduleName, LONGINT moduleName__len)
 	__DEL(moduleName);
 }
 
-void extTools_LinkMain (CHAR *moduleName, LONGINT moduleName__len, BOOLEAN statically, CHAR *additionalopts, LONGINT additionalopts__len)
+void extTools_LinkMain (CHAR *moduleName, ADDRESS moduleName__len, BOOLEAN statically, CHAR *additionalopts, ADDRESS additionalopts__len)
 {
 	CHAR cmd[1023];
 	__DUP(additionalopts, additionalopts__len, CHAR);
diff --git a/bootstrap/unix-88/extTools.h b/bootstrap/unix-88/extTools.h
index 63e5df15..472c60f3 100644
--- a/bootstrap/unix-88/extTools.h
+++ b/bootstrap/unix-88/extTools.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef extTools__h
 #define extTools__h
@@ -8,8 +8,8 @@
 
 
 
-import void extTools_Assemble (CHAR *moduleName, LONGINT moduleName__len);
-import void extTools_LinkMain (CHAR *moduleName, LONGINT moduleName__len, BOOLEAN statically, CHAR *additionalopts, LONGINT additionalopts__len);
+import void extTools_Assemble (CHAR *moduleName, ADDRESS moduleName__len);
+import void extTools_LinkMain (CHAR *moduleName, ADDRESS moduleName__len, BOOLEAN statically, CHAR *additionalopts, ADDRESS additionalopts__len);
 import void *extTools__init(void);
 
 
diff --git a/bootstrap/windows-48/Compiler.c b/bootstrap/windows-48/Compiler.c
index dc4bb660..e900905f 100644
--- a/bootstrap/windows-48/Compiler.c
+++ b/bootstrap/windows-48/Compiler.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. xtspamS */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. xtspamS */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/windows-48/Configuration.c b/bootstrap/windows-48/Configuration.c
index 2d0061df..071d7b8e 100644
--- a/bootstrap/windows-48/Configuration.c
+++ b/bootstrap/windows-48/Configuration.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
@@ -19,6 +19,6 @@ export void *Configuration__init(void)
 	__DEFMOD;
 	__REGMOD("Configuration", 0);
 /* BEGIN */
-	__MOVE("1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8.", Configuration_versionLong, 75);
+	__MOVE("2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8.", Configuration_versionLong, 75);
 	__ENDMOD;
 }
diff --git a/bootstrap/windows-48/Configuration.h b/bootstrap/windows-48/Configuration.h
index b28e0caa..b1942442 100644
--- a/bootstrap/windows-48/Configuration.h
+++ b/bootstrap/windows-48/Configuration.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef Configuration__h
 #define Configuration__h
diff --git a/bootstrap/windows-48/Files.c b/bootstrap/windows-48/Files.c
index 5326fe10..bdbabe97 100644
--- a/bootstrap/windows-48/Files.c
+++ b/bootstrap/windows-48/Files.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. tspaSF */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. tspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
@@ -52,7 +52,7 @@ static Files_File Files_files;
 static INT16 Files_tempno;
 static CHAR Files_HOME[1024];
 static struct {
-	LONGINT len[1];
+	ADDRESS len[1];
 	CHAR data[1];
 } *Files_SearchPath;
 
@@ -62,56 +62,56 @@ export ADDRESS *Files_Rider__typ;
 
 export Files_File Files_Base (Files_Rider *r, ADDRESS *r__typ);
 static Files_File Files_CacheEntry (Platform_FileIdentity identity);
-export void Files_ChangeDirectory (CHAR *path, LONGINT path__len, INT16 *res);
+export void Files_ChangeDirectory (CHAR *path, ADDRESS path__len, INT16 *res);
 export void Files_Close (Files_File f);
 static void Files_CloseOSFile (Files_File f);
 static void Files_Create (Files_File f);
-export void Files_Delete (CHAR *name, LONGINT name__len, INT16 *res);
-static void Files_Err (CHAR *s, LONGINT s__len, Files_File f, INT16 errcode);
+export void Files_Delete (CHAR *name, ADDRESS name__len, INT16 *res);
+static void Files_Err (CHAR *s, ADDRESS s__len, Files_File f, INT16 errcode);
 static void Files_Finalize (SYSTEM_PTR o);
-static void Files_FlipBytes (SYSTEM_BYTE *src, LONGINT src__len, SYSTEM_BYTE *dest, LONGINT dest__len);
+static void Files_FlipBytes (SYSTEM_BYTE *src, ADDRESS src__len, SYSTEM_BYTE *dest, ADDRESS dest__len);
 static void Files_Flush (Files_Buffer buf);
 export void Files_GetDate (Files_File f, INT32 *t, INT32 *d);
-export void Files_GetName (Files_File f, CHAR *name, LONGINT name__len);
-static void Files_GetTempName (CHAR *finalName, LONGINT finalName__len, CHAR *name, LONGINT name__len);
-static BOOLEAN Files_HasDir (CHAR *name, LONGINT name__len);
+export void Files_GetName (Files_File f, CHAR *name, ADDRESS name__len);
+static void Files_GetTempName (CHAR *finalName, ADDRESS finalName__len, CHAR *name, ADDRESS name__len);
+static BOOLEAN Files_HasDir (CHAR *name, ADDRESS name__len);
 export INT32 Files_Length (Files_File f);
-static void Files_MakeFileName (CHAR *dir, LONGINT dir__len, CHAR *name, LONGINT name__len, CHAR *dest, LONGINT dest__len);
-export Files_File Files_New (CHAR *name, LONGINT name__len);
-export Files_File Files_Old (CHAR *name, LONGINT name__len);
+static void Files_MakeFileName (CHAR *dir, ADDRESS dir__len, CHAR *name, ADDRESS name__len, CHAR *dest, ADDRESS dest__len);
+export Files_File Files_New (CHAR *name, ADDRESS name__len);
+export Files_File Files_Old (CHAR *name, ADDRESS name__len);
 export INT32 Files_Pos (Files_Rider *r, ADDRESS *r__typ);
 export void Files_Purge (Files_File f);
 export void Files_Read (Files_Rider *r, ADDRESS *r__typ, SYSTEM_BYTE *x);
 export void Files_ReadBool (Files_Rider *R, ADDRESS *R__typ, BOOLEAN *x);
-export void Files_ReadBytes (Files_Rider *r, ADDRESS *r__typ, SYSTEM_BYTE *x, LONGINT x__len, INT32 n);
+export void Files_ReadBytes (Files_Rider *r, ADDRESS *r__typ, SYSTEM_BYTE *x, ADDRESS x__len, INT32 n);
 export void Files_ReadInt (Files_Rider *R, ADDRESS *R__typ, INT16 *x);
 export void Files_ReadLInt (Files_Rider *R, ADDRESS *R__typ, INT32 *x);
 export void Files_ReadLReal (Files_Rider *R, ADDRESS *R__typ, LONGREAL *x);
-export void Files_ReadLine (Files_Rider *R, ADDRESS *R__typ, CHAR *x, LONGINT x__len);
-export void Files_ReadNum (Files_Rider *R, ADDRESS *R__typ, SYSTEM_BYTE *x, LONGINT x__len);
+export void Files_ReadLine (Files_Rider *R, ADDRESS *R__typ, CHAR *x, ADDRESS x__len);
+export void Files_ReadNum (Files_Rider *R, ADDRESS *R__typ, SYSTEM_BYTE *x, ADDRESS x__len);
 export void Files_ReadReal (Files_Rider *R, ADDRESS *R__typ, REAL *x);
 export void Files_ReadSet (Files_Rider *R, ADDRESS *R__typ, UINT32 *x);
-export void Files_ReadString (Files_Rider *R, ADDRESS *R__typ, CHAR *x, LONGINT x__len);
+export void Files_ReadString (Files_Rider *R, ADDRESS *R__typ, CHAR *x, ADDRESS x__len);
 export void Files_Register (Files_File f);
-export void Files_Rename (CHAR *old, LONGINT old__len, CHAR *new, LONGINT new__len, INT16 *res);
-static void Files_ScanPath (INT16 *pos, CHAR *dir, LONGINT dir__len);
+export void Files_Rename (CHAR *old, ADDRESS old__len, CHAR *new, ADDRESS new__len, INT16 *res);
+static void Files_ScanPath (INT16 *pos, CHAR *dir, ADDRESS dir__len);
 export void Files_Set (Files_Rider *r, ADDRESS *r__typ, Files_File f, INT32 pos);
-export void Files_SetSearchPath (CHAR *path, LONGINT path__len);
+export void Files_SetSearchPath (CHAR *path, ADDRESS path__len);
 export void Files_Write (Files_Rider *r, ADDRESS *r__typ, SYSTEM_BYTE x);
 export void Files_WriteBool (Files_Rider *R, ADDRESS *R__typ, BOOLEAN x);
-export void Files_WriteBytes (Files_Rider *r, ADDRESS *r__typ, SYSTEM_BYTE *x, LONGINT x__len, INT32 n);
+export void Files_WriteBytes (Files_Rider *r, ADDRESS *r__typ, SYSTEM_BYTE *x, ADDRESS x__len, INT32 n);
 export void Files_WriteInt (Files_Rider *R, ADDRESS *R__typ, INT16 x);
 export void Files_WriteLInt (Files_Rider *R, ADDRESS *R__typ, INT32 x);
 export void Files_WriteLReal (Files_Rider *R, ADDRESS *R__typ, LONGREAL x);
 export void Files_WriteNum (Files_Rider *R, ADDRESS *R__typ, INT64 x);
 export void Files_WriteReal (Files_Rider *R, ADDRESS *R__typ, REAL x);
 export void Files_WriteSet (Files_Rider *R, ADDRESS *R__typ, UINT32 x);
-export void Files_WriteString (Files_Rider *R, ADDRESS *R__typ, CHAR *x, LONGINT x__len);
+export void Files_WriteString (Files_Rider *R, ADDRESS *R__typ, CHAR *x, ADDRESS x__len);
 
 #define Files_IdxTrap()	__HALT(-1)
 #define Files_ToAdr(x)	(ADDRESS)x
 
-static void Files_Err (CHAR *s, LONGINT s__len, Files_File f, INT16 errcode)
+static void Files_Err (CHAR *s, ADDRESS s__len, Files_File f, INT16 errcode)
 {
 	__DUP(s, s__len, CHAR);
 	Out_Ln();
@@ -138,7 +138,7 @@ static void Files_Err (CHAR *s, LONGINT s__len, Files_File f, INT16 errcode)
 	__DEL(s);
 }
 
-static void Files_MakeFileName (CHAR *dir, LONGINT dir__len, CHAR *name, LONGINT name__len, CHAR *dest, LONGINT dest__len)
+static void Files_MakeFileName (CHAR *dir, ADDRESS dir__len, CHAR *name, ADDRESS name__len, CHAR *dest, ADDRESS dest__len)
 {
 	INT16 i, j;
 	__DUP(dir, dir__len, CHAR);
@@ -163,7 +163,7 @@ static void Files_MakeFileName (CHAR *dir, LONGINT dir__len, CHAR *name, LONGINT
 	__DEL(name);
 }
 
-static void Files_GetTempName (CHAR *finalName, LONGINT finalName__len, CHAR *name, LONGINT name__len)
+static void Files_GetTempName (CHAR *finalName, ADDRESS finalName__len, CHAR *name, ADDRESS name__len)
 {
 	INT32 n, i, j;
 	__DUP(finalName, finalName__len, CHAR);
@@ -316,7 +316,7 @@ INT32 Files_Length (Files_File f)
 	return f->len;
 }
 
-Files_File Files_New (CHAR *name, LONGINT name__len)
+Files_File Files_New (CHAR *name, ADDRESS name__len)
 {
 	Files_File f = NIL;
 	__DUP(name, name__len, CHAR);
@@ -332,7 +332,7 @@ Files_File Files_New (CHAR *name, LONGINT name__len)
 	return f;
 }
 
-static void Files_ScanPath (INT16 *pos, CHAR *dir, LONGINT dir__len)
+static void Files_ScanPath (INT16 *pos, CHAR *dir, ADDRESS dir__len)
 {
 	INT16 i;
 	CHAR ch;
@@ -375,7 +375,7 @@ static void Files_ScanPath (INT16 *pos, CHAR *dir, LONGINT dir__len)
 	dir[i] = 0x00;
 }
 
-static BOOLEAN Files_HasDir (CHAR *name, LONGINT name__len)
+static BOOLEAN Files_HasDir (CHAR *name, ADDRESS name__len)
 {
 	INT16 i;
 	CHAR ch;
@@ -415,7 +415,7 @@ static Files_File Files_CacheEntry (Platform_FileIdentity identity)
 	return NIL;
 }
 
-Files_File Files_Old (CHAR *name, LONGINT name__len)
+Files_File Files_Old (CHAR *name, ADDRESS name__len)
 {
 	Files_File f = NIL;
 	INT32 fd;
@@ -618,7 +618,7 @@ void Files_Read (Files_Rider *r, ADDRESS *r__typ, SYSTEM_BYTE *x)
 	}
 }
 
-void Files_ReadBytes (Files_Rider *r, ADDRESS *r__typ, SYSTEM_BYTE *x, LONGINT x__len, INT32 n)
+void Files_ReadBytes (Files_Rider *r, ADDRESS *r__typ, SYSTEM_BYTE *x, ADDRESS x__len, INT32 n)
 {
 	INT32 xpos, min, restInBuf, offset;
 	Files_Buffer buf = NIL;
@@ -683,7 +683,7 @@ void Files_Write (Files_Rider *r, ADDRESS *r__typ, SYSTEM_BYTE x)
 	(*r).res = 0;
 }
 
-void Files_WriteBytes (Files_Rider *r, ADDRESS *r__typ, SYSTEM_BYTE *x, LONGINT x__len, INT32 n)
+void Files_WriteBytes (Files_Rider *r, ADDRESS *r__typ, SYSTEM_BYTE *x, ADDRESS x__len, INT32 n)
 {
 	INT32 xpos, min, restInBuf, offset;
 	Files_Buffer buf = NIL;
@@ -722,14 +722,14 @@ void Files_WriteBytes (Files_Rider *r, ADDRESS *r__typ, SYSTEM_BYTE *x, LONGINT
 	(*r).res = 0;
 }
 
-void Files_Delete (CHAR *name, LONGINT name__len, INT16 *res)
+void Files_Delete (CHAR *name, ADDRESS name__len, INT16 *res)
 {
 	__DUP(name, name__len, CHAR);
 	*res = Platform_Unlink((void*)name, name__len);
 	__DEL(name);
 }
 
-void Files_Rename (CHAR *old, LONGINT old__len, CHAR *new, LONGINT new__len, INT16 *res)
+void Files_Rename (CHAR *old, ADDRESS old__len, CHAR *new, ADDRESS new__len, INT16 *res)
 {
 	INT32 fdold, fdnew, n;
 	INT16 error, ignore;
@@ -812,14 +812,14 @@ void Files_Register (Files_File f)
 	}
 }
 
-void Files_ChangeDirectory (CHAR *path, LONGINT path__len, INT16 *res)
+void Files_ChangeDirectory (CHAR *path, ADDRESS path__len, INT16 *res)
 {
 	__DUP(path, path__len, CHAR);
 	*res = Platform_Chdir((void*)path, path__len);
 	__DEL(path);
 }
 
-static void Files_FlipBytes (SYSTEM_BYTE *src, LONGINT src__len, SYSTEM_BYTE *dest, LONGINT dest__len)
+static void Files_FlipBytes (SYSTEM_BYTE *src, ADDRESS src__len, SYSTEM_BYTE *dest, ADDRESS dest__len)
 {
 	INT32 i, j;
 	if (!Platform_LittleEndian) {
@@ -877,7 +877,7 @@ void Files_ReadLReal (Files_Rider *R, ADDRESS *R__typ, LONGREAL *x)
 	Files_FlipBytes((void*)b, 8, (void*)&*x, 8);
 }
 
-void Files_ReadString (Files_Rider *R, ADDRESS *R__typ, CHAR *x, LONGINT x__len)
+void Files_ReadString (Files_Rider *R, ADDRESS *R__typ, CHAR *x, ADDRESS x__len)
 {
 	INT16 i;
 	CHAR ch;
@@ -889,7 +889,7 @@ void Files_ReadString (Files_Rider *R, ADDRESS *R__typ, CHAR *x, LONGINT x__len)
 	} while (!(ch == 0x00));
 }
 
-void Files_ReadLine (Files_Rider *R, ADDRESS *R__typ, CHAR *x, LONGINT x__len)
+void Files_ReadLine (Files_Rider *R, ADDRESS *R__typ, CHAR *x, ADDRESS x__len)
 {
 	INT16 i;
 	i = 0;
@@ -906,7 +906,7 @@ void Files_ReadLine (Files_Rider *R, ADDRESS *R__typ, CHAR *x, LONGINT x__len)
 	x[i] = 0x00;
 }
 
-void Files_ReadNum (Files_Rider *R, ADDRESS *R__typ, SYSTEM_BYTE *x, LONGINT x__len)
+void Files_ReadNum (Files_Rider *R, ADDRESS *R__typ, SYSTEM_BYTE *x, ADDRESS x__len)
 {
 	INT8 s, b;
 	INT64 q;
@@ -972,7 +972,7 @@ void Files_WriteLReal (Files_Rider *R, ADDRESS *R__typ, LONGREAL x)
 	Files_WriteBytes(&*R, R__typ, (void*)b, 8, 8);
 }
 
-void Files_WriteString (Files_Rider *R, ADDRESS *R__typ, CHAR *x, LONGINT x__len)
+void Files_WriteString (Files_Rider *R, ADDRESS *R__typ, CHAR *x, ADDRESS x__len)
 {
 	INT16 i;
 	i = 0;
@@ -991,7 +991,7 @@ void Files_WriteNum (Files_Rider *R, ADDRESS *R__typ, INT64 x)
 	Files_Write(&*R, R__typ, (CHAR)__MASK(x, -128));
 }
 
-void Files_GetName (Files_File f, CHAR *name, LONGINT name__len)
+void Files_GetName (Files_File f, CHAR *name, ADDRESS name__len)
 {
 	__COPY(f->workName, name, name__len);
 }
@@ -1009,7 +1009,7 @@ static void Files_Finalize (SYSTEM_PTR o)
 	}
 }
 
-void Files_SetSearchPath (CHAR *path, LONGINT path__len)
+void Files_SetSearchPath (CHAR *path, ADDRESS path__len)
 {
 	__DUP(path, path__len, CHAR);
 	if (Strings_Length(path, path__len) != 0) {
diff --git a/bootstrap/windows-48/Files.h b/bootstrap/windows-48/Files.h
index 62df86fc..2750cbdd 100644
--- a/bootstrap/windows-48/Files.h
+++ b/bootstrap/windows-48/Files.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. tspaSF */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. tspaSF */
 
 #ifndef Files__h
 #define Files__h
@@ -28,41 +28,41 @@ import ADDRESS *Files_FileDesc__typ;
 import ADDRESS *Files_Rider__typ;
 
 import Files_File Files_Base (Files_Rider *r, ADDRESS *r__typ);
-import void Files_ChangeDirectory (CHAR *path, LONGINT path__len, INT16 *res);
+import void Files_ChangeDirectory (CHAR *path, ADDRESS path__len, INT16 *res);
 import void Files_Close (Files_File f);
-import void Files_Delete (CHAR *name, LONGINT name__len, INT16 *res);
+import void Files_Delete (CHAR *name, ADDRESS name__len, INT16 *res);
 import void Files_GetDate (Files_File f, INT32 *t, INT32 *d);
-import void Files_GetName (Files_File f, CHAR *name, LONGINT name__len);
+import void Files_GetName (Files_File f, CHAR *name, ADDRESS name__len);
 import INT32 Files_Length (Files_File f);
-import Files_File Files_New (CHAR *name, LONGINT name__len);
-import Files_File Files_Old (CHAR *name, LONGINT name__len);
+import Files_File Files_New (CHAR *name, ADDRESS name__len);
+import Files_File Files_Old (CHAR *name, ADDRESS name__len);
 import INT32 Files_Pos (Files_Rider *r, ADDRESS *r__typ);
 import void Files_Purge (Files_File f);
 import void Files_Read (Files_Rider *r, ADDRESS *r__typ, SYSTEM_BYTE *x);
 import void Files_ReadBool (Files_Rider *R, ADDRESS *R__typ, BOOLEAN *x);
-import void Files_ReadBytes (Files_Rider *r, ADDRESS *r__typ, SYSTEM_BYTE *x, LONGINT x__len, INT32 n);
+import void Files_ReadBytes (Files_Rider *r, ADDRESS *r__typ, SYSTEM_BYTE *x, ADDRESS x__len, INT32 n);
 import void Files_ReadInt (Files_Rider *R, ADDRESS *R__typ, INT16 *x);
 import void Files_ReadLInt (Files_Rider *R, ADDRESS *R__typ, INT32 *x);
 import void Files_ReadLReal (Files_Rider *R, ADDRESS *R__typ, LONGREAL *x);
-import void Files_ReadLine (Files_Rider *R, ADDRESS *R__typ, CHAR *x, LONGINT x__len);
-import void Files_ReadNum (Files_Rider *R, ADDRESS *R__typ, SYSTEM_BYTE *x, LONGINT x__len);
+import void Files_ReadLine (Files_Rider *R, ADDRESS *R__typ, CHAR *x, ADDRESS x__len);
+import void Files_ReadNum (Files_Rider *R, ADDRESS *R__typ, SYSTEM_BYTE *x, ADDRESS x__len);
 import void Files_ReadReal (Files_Rider *R, ADDRESS *R__typ, REAL *x);
 import void Files_ReadSet (Files_Rider *R, ADDRESS *R__typ, UINT32 *x);
-import void Files_ReadString (Files_Rider *R, ADDRESS *R__typ, CHAR *x, LONGINT x__len);
+import void Files_ReadString (Files_Rider *R, ADDRESS *R__typ, CHAR *x, ADDRESS x__len);
 import void Files_Register (Files_File f);
-import void Files_Rename (CHAR *old, LONGINT old__len, CHAR *new, LONGINT new__len, INT16 *res);
+import void Files_Rename (CHAR *old, ADDRESS old__len, CHAR *new, ADDRESS new__len, INT16 *res);
 import void Files_Set (Files_Rider *r, ADDRESS *r__typ, Files_File f, INT32 pos);
-import void Files_SetSearchPath (CHAR *path, LONGINT path__len);
+import void Files_SetSearchPath (CHAR *path, ADDRESS path__len);
 import void Files_Write (Files_Rider *r, ADDRESS *r__typ, SYSTEM_BYTE x);
 import void Files_WriteBool (Files_Rider *R, ADDRESS *R__typ, BOOLEAN x);
-import void Files_WriteBytes (Files_Rider *r, ADDRESS *r__typ, SYSTEM_BYTE *x, LONGINT x__len, INT32 n);
+import void Files_WriteBytes (Files_Rider *r, ADDRESS *r__typ, SYSTEM_BYTE *x, ADDRESS x__len, INT32 n);
 import void Files_WriteInt (Files_Rider *R, ADDRESS *R__typ, INT16 x);
 import void Files_WriteLInt (Files_Rider *R, ADDRESS *R__typ, INT32 x);
 import void Files_WriteLReal (Files_Rider *R, ADDRESS *R__typ, LONGREAL x);
 import void Files_WriteNum (Files_Rider *R, ADDRESS *R__typ, INT64 x);
 import void Files_WriteReal (Files_Rider *R, ADDRESS *R__typ, REAL x);
 import void Files_WriteSet (Files_Rider *R, ADDRESS *R__typ, UINT32 x);
-import void Files_WriteString (Files_Rider *R, ADDRESS *R__typ, CHAR *x, LONGINT x__len);
+import void Files_WriteString (Files_Rider *R, ADDRESS *R__typ, CHAR *x, ADDRESS x__len);
 import void *Files__init(void);
 
 
diff --git a/bootstrap/windows-48/Heap.c b/bootstrap/windows-48/Heap.c
index 72677604..ba769b74 100644
--- a/bootstrap/windows-48/Heap.c
+++ b/bootstrap/windows-48/Heap.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. tsSF */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. tsSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
@@ -85,14 +85,14 @@ static void Heap_ExtendHeap (INT32 blksz);
 export void Heap_FINALL (void);
 static void Heap_Finalize (void);
 export void Heap_GC (BOOLEAN markStack);
-static void Heap_HeapSort (INT32 n, INT32 *a, LONGINT a__len);
+static void Heap_HeapSort (INT32 n, INT32 *a, ADDRESS a__len);
 export void Heap_INCREF (Heap_Module m);
 export void Heap_InitHeap (void);
 export void Heap_Lock (void);
 static void Heap_Mark (INT32 q);
-static void Heap_MarkCandidates (INT32 n, INT32 *cand, LONGINT cand__len);
+static void Heap_MarkCandidates (INT32 n, INT32 *cand, ADDRESS cand__len);
 static void Heap_MarkP (SYSTEM_PTR p);
-static void Heap_MarkStack (INT32 n, INT32 *cand, LONGINT cand__len);
+static void Heap_MarkStack (INT32 n, INT32 *cand, ADDRESS cand__len);
 export SYSTEM_PTR Heap_NEWBLK (INT32 size);
 export SYSTEM_PTR Heap_NEWREC (INT32 tag);
 static INT32 Heap_NewChunk (INT32 blksz);
@@ -101,7 +101,7 @@ export SYSTEM_PTR Heap_REGMOD (Heap_ModuleName name, Heap_EnumProc enumPtrs);
 export void Heap_REGTYP (Heap_Module m, INT32 typ);
 export void Heap_RegisterFinalizer (SYSTEM_PTR obj, Heap_Finalizer finalize);
 static void Heap_Scan (void);
-static void Heap_Sift (INT32 l, INT32 r, INT32 *a, LONGINT a__len);
+static void Heap_Sift (INT32 l, INT32 r, INT32 *a, ADDRESS a__len);
 export void Heap_Unlock (void);
 
 extern void *Heap__init();
@@ -445,7 +445,7 @@ static void Heap_Scan (void)
 	}
 }
 
-static void Heap_Sift (INT32 l, INT32 r, INT32 *a, LONGINT a__len)
+static void Heap_Sift (INT32 l, INT32 r, INT32 *a, ADDRESS a__len)
 {
 	INT32 i, j, x;
 	j = l;
@@ -464,7 +464,7 @@ static void Heap_Sift (INT32 l, INT32 r, INT32 *a, LONGINT a__len)
 	a[i] = x;
 }
 
-static void Heap_HeapSort (INT32 n, INT32 *a, LONGINT a__len)
+static void Heap_HeapSort (INT32 n, INT32 *a, ADDRESS a__len)
 {
 	INT32 l, r, x;
 	l = __ASHR(n, 1);
@@ -482,7 +482,7 @@ static void Heap_HeapSort (INT32 n, INT32 *a, LONGINT a__len)
 	}
 }
 
-static void Heap_MarkCandidates (INT32 n, INT32 *cand, LONGINT cand__len)
+static void Heap_MarkCandidates (INT32 n, INT32 *cand, ADDRESS cand__len)
 {
 	INT32 chnk, adr, tag, next, lim, lim1, i, ptr, size;
 	chnk = Heap_heap;
@@ -571,7 +571,7 @@ void Heap_FINALL (void)
 	}
 }
 
-static void Heap_MarkStack (INT32 n, INT32 *cand, LONGINT cand__len)
+static void Heap_MarkStack (INT32 n, INT32 *cand, ADDRESS cand__len)
 {
 	SYSTEM_PTR frame;
 	INT32 inc, nofcand, sp, p, stack0;
diff --git a/bootstrap/windows-48/Heap.h b/bootstrap/windows-48/Heap.h
index 0aa0a18b..d200254d 100644
--- a/bootstrap/windows-48/Heap.h
+++ b/bootstrap/windows-48/Heap.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. tsSF */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. tsSF */
 
 #ifndef Heap__h
 #define Heap__h
diff --git a/bootstrap/windows-48/Modules.c b/bootstrap/windows-48/Modules.c
index a5e72ba3..27e4473c 100644
--- a/bootstrap/windows-48/Modules.c
+++ b/bootstrap/windows-48/Modules.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
@@ -47,21 +47,21 @@ export Modules_ModuleName Modules_imported, Modules_importing;
 export ADDRESS *Modules_ModuleDesc__typ;
 export ADDRESS *Modules_CmdDesc__typ;
 
-static void Modules_Append (CHAR *a, LONGINT a__len, CHAR *b, LONGINT b__len);
+static void Modules_Append (CHAR *a, ADDRESS a__len, CHAR *b, ADDRESS b__len);
 export void Modules_AssertFail (INT32 code);
 static void Modules_DisplayHaltCode (INT32 code);
-export void Modules_Free (CHAR *name, LONGINT name__len, BOOLEAN all);
+export void Modules_Free (CHAR *name, ADDRESS name__len, BOOLEAN all);
 export void Modules_Halt (INT32 code);
-export Modules_Command Modules_ThisCommand (Modules_Module mod, CHAR *name, LONGINT name__len);
-export Modules_Module Modules_ThisMod (CHAR *name, LONGINT name__len);
+export Modules_Command Modules_ThisCommand (Modules_Module mod, CHAR *name, ADDRESS name__len);
+export Modules_Module Modules_ThisMod (CHAR *name, ADDRESS name__len);
 static void Modules_errch (CHAR c);
 static void Modules_errint (INT32 l);
-static void Modules_errstring (CHAR *s, LONGINT s__len);
+static void Modules_errstring (CHAR *s, ADDRESS s__len);
 
 #define Modules_modules()	(Modules_Module)Heap_modules
 #define Modules_setmodules(m)	Heap_modules = m
 
-static void Modules_Append (CHAR *a, LONGINT a__len, CHAR *b, LONGINT b__len)
+static void Modules_Append (CHAR *a, ADDRESS a__len, CHAR *b, ADDRESS b__len)
 {
 	INT16 i, j;
 	__DUP(b, b__len, CHAR);
@@ -79,7 +79,7 @@ static void Modules_Append (CHAR *a, LONGINT a__len, CHAR *b, LONGINT b__len)
 	__DEL(b);
 }
 
-Modules_Module Modules_ThisMod (CHAR *name, LONGINT name__len)
+Modules_Module Modules_ThisMod (CHAR *name, ADDRESS name__len)
 {
 	Modules_Module m = NIL;
 	CHAR bodyname[64];
@@ -103,7 +103,7 @@ Modules_Module Modules_ThisMod (CHAR *name, LONGINT name__len)
 	return m;
 }
 
-Modules_Command Modules_ThisCommand (Modules_Module mod, CHAR *name, LONGINT name__len)
+Modules_Command Modules_ThisCommand (Modules_Module mod, CHAR *name, ADDRESS name__len)
 {
 	Modules_Cmd c = NIL;
 	__DUP(name, name__len, CHAR);
@@ -130,7 +130,7 @@ Modules_Command Modules_ThisCommand (Modules_Module mod, CHAR *name, LONGINT nam
 	__RETCHK;
 }
 
-void Modules_Free (CHAR *name, LONGINT name__len, BOOLEAN all)
+void Modules_Free (CHAR *name, ADDRESS name__len, BOOLEAN all)
 {
 	Modules_Module m = NIL, p = NIL;
 	__DUP(name, name__len, CHAR);
@@ -168,7 +168,7 @@ static void Modules_errch (CHAR c)
 	e = Platform_Write(1, (ADDRESS)&c, 1);
 }
 
-static void Modules_errstring (CHAR *s, LONGINT s__len)
+static void Modules_errstring (CHAR *s, ADDRESS s__len)
 {
 	INT32 i;
 	__DUP(s, s__len, CHAR);
diff --git a/bootstrap/windows-48/Modules.h b/bootstrap/windows-48/Modules.h
index 8bb89fe5..b1f2385e 100644
--- a/bootstrap/windows-48/Modules.h
+++ b/bootstrap/windows-48/Modules.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef Modules__h
 #define Modules__h
@@ -44,10 +44,10 @@ import ADDRESS *Modules_ModuleDesc__typ;
 import ADDRESS *Modules_CmdDesc__typ;
 
 import void Modules_AssertFail (INT32 code);
-import void Modules_Free (CHAR *name, LONGINT name__len, BOOLEAN all);
+import void Modules_Free (CHAR *name, ADDRESS name__len, BOOLEAN all);
 import void Modules_Halt (INT32 code);
-import Modules_Command Modules_ThisCommand (Modules_Module mod, CHAR *name, LONGINT name__len);
-import Modules_Module Modules_ThisMod (CHAR *name, LONGINT name__len);
+import Modules_Command Modules_ThisCommand (Modules_Module mod, CHAR *name, ADDRESS name__len);
+import Modules_Module Modules_ThisMod (CHAR *name, ADDRESS name__len);
 import void *Modules__init(void);
 
 
diff --git a/bootstrap/windows-48/OPB.c b/bootstrap/windows-48/OPB.c
index 3ef8e2f9..bc44b83a 100644
--- a/bootstrap/windows-48/OPB.c
+++ b/bootstrap/windows-48/OPB.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/windows-48/OPB.h b/bootstrap/windows-48/OPB.h
index 0be714e8..eb93787e 100644
--- a/bootstrap/windows-48/OPB.h
+++ b/bootstrap/windows-48/OPB.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef OPB__h
 #define OPB__h
diff --git a/bootstrap/windows-48/OPC.c b/bootstrap/windows-48/OPC.c
index ef4b429f..72e0feef 100644
--- a/bootstrap/windows-48/OPC.c
+++ b/bootstrap/windows-48/OPC.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
@@ -56,7 +56,7 @@ static void OPC_GenHeaderMsg (void);
 export void OPC_Halt (INT32 n);
 export void OPC_Ident (OPT_Object obj);
 static void OPC_IdentList (OPT_Object obj, INT16 vis);
-static void OPC_Include (CHAR *name, LONGINT name__len);
+static void OPC_Include (CHAR *name, ADDRESS name__len);
 static void OPC_IncludeImports (OPT_Object obj, INT16 vis);
 export void OPC_Increment (BOOLEAN decrement);
 export void OPC_Indent (INT16 count);
@@ -68,11 +68,11 @@ static void OPC_InitTProcs (OPT_Object typ, OPT_Object obj);
 export void OPC_IntLiteral (INT64 n, INT32 size);
 export void OPC_Len (OPT_Object obj, OPT_Struct array, INT64 dim);
 static void OPC_LenList (OPT_Object par, BOOLEAN ansiDefine, BOOLEAN showParamName);
-static INT16 OPC_Length (CHAR *s, LONGINT s__len);
+static INT16 OPC_Length (CHAR *s, ADDRESS s__len);
 export BOOLEAN OPC_NeedsRetval (OPT_Object proc);
 export INT32 OPC_NofPtrs (OPT_Struct typ);
-static INT16 OPC_PerfectHash (CHAR *s, LONGINT s__len);
-static BOOLEAN OPC_Prefixed (OPT_ConstExt x, CHAR *y, LONGINT y__len);
+static INT16 OPC_PerfectHash (CHAR *s, ADDRESS s__len);
+static BOOLEAN OPC_Prefixed (OPT_ConstExt x, CHAR *y, ADDRESS y__len);
 static void OPC_ProcHeader (OPT_Object proc, BOOLEAN define);
 static void OPC_ProcPredefs (OPT_Object obj, INT8 vis);
 static void OPC_PutBase (OPT_Struct typ);
@@ -80,8 +80,8 @@ static void OPC_PutPtrOffsets (OPT_Struct typ, INT32 adr, INT32 *cnt);
 static void OPC_RegCmds (OPT_Object obj);
 export void OPC_SetInclude (BOOLEAN exclude);
 static void OPC_Stars (OPT_Struct typ, BOOLEAN *openClause);
-static void OPC_Str1 (CHAR *s, LONGINT s__len, INT32 x);
-static void OPC_StringLiteral (CHAR *s, LONGINT s__len, INT32 l);
+static void OPC_Str1 (CHAR *s, ADDRESS s__len, INT32 x);
+static void OPC_StringLiteral (CHAR *s, ADDRESS s__len, INT32 l);
 export void OPC_TDescDecl (OPT_Struct typ);
 export void OPC_TypeDefs (OPT_Object obj, INT16 vis);
 export void OPC_TypeOf (OPT_Object ap);
@@ -137,7 +137,7 @@ void OPC_EndBlk0 (void)
 	OPM_Write('}');
 }
 
-static void OPC_Str1 (CHAR *s, LONGINT s__len, INT32 x)
+static void OPC_Str1 (CHAR *s, ADDRESS s__len, INT32 x)
 {
 	CHAR ch;
 	INT16 i;
@@ -156,7 +156,7 @@ static void OPC_Str1 (CHAR *s, LONGINT s__len, INT32 x)
 	__DEL(s);
 }
 
-static INT16 OPC_Length (CHAR *s, LONGINT s__len)
+static INT16 OPC_Length (CHAR *s, ADDRESS s__len)
 {
 	INT16 i;
 	i = 0;
@@ -166,7 +166,7 @@ static INT16 OPC_Length (CHAR *s, LONGINT s__len)
 	return i;
 }
 
-static INT16 OPC_PerfectHash (CHAR *s, LONGINT s__len)
+static INT16 OPC_PerfectHash (CHAR *s, ADDRESS s__len)
 {
 	INT16 i, h;
 	i = 0;
@@ -364,7 +364,7 @@ static void OPC_DeclareBase (OPT_Object dcl)
 		OPM_WriteString((CHAR*)"struct ", 8);
 		OPC_BegBlk();
 		OPC_BegStat();
-		OPC_Str1((CHAR*)"LONGINT len[#]", 15, nofdims);
+		OPC_Str1((CHAR*)"ADDRESS len[#]", 15, nofdims);
 		OPC_EndStat();
 		OPC_BegStat();
 		__NEW(obj, OPT_ObjDesc);
@@ -511,7 +511,7 @@ static void OPC_LenList (OPT_Object par, BOOLEAN ansiDefine, BOOLEAN showParamNa
 	typ = par->typ->BaseTyp;
 	while (typ->comp == 3) {
 		if (ansiDefine) {
-			OPM_WriteString((CHAR*)", LONGINT ", 11);
+			OPM_WriteString((CHAR*)", ADDRESS ", 11);
 		} else {
 			OPM_WriteString((CHAR*)", ", 3);
 		}
@@ -720,7 +720,7 @@ static void OPC_DefineType (OPT_Struct str)
 	}
 }
 
-static BOOLEAN OPC_Prefixed (OPT_ConstExt x, CHAR *y, LONGINT y__len)
+static BOOLEAN OPC_Prefixed (OPT_ConstExt x, CHAR *y, ADDRESS y__len)
 {
 	INT16 i;
 	__DUP(y, y__len, CHAR);
@@ -969,7 +969,7 @@ static void OPC_IdentList (OPT_Object obj, INT16 vis)
 				OPC_EndStat();
 				OPC_BegStat();
 				base = OPT_linttyp;
-				OPM_WriteString((CHAR*)"LONGINT ", 9);
+				OPM_WriteString((CHAR*)"ADDRESS ", 9);
 				OPC_LenList(obj, 0, 1);
 			} else if ((obj->mode == 2 && obj->typ->comp == 4)) {
 				OPC_EndStat();
@@ -1008,7 +1008,7 @@ static void OPC_AnsiParamList (OPT_Object obj, BOOLEAN showParamNames)
 				__COPY(name, obj->name, 256);
 			}
 			if (obj->typ->comp == 3) {
-				OPM_WriteString((CHAR*)", LONGINT ", 11);
+				OPM_WriteString((CHAR*)", ADDRESS ", 11);
 				OPC_LenList(obj, 1, showParamNames);
 			} else if ((obj->mode == 2 && obj->typ->comp == 4)) {
 				OPM_WriteString((CHAR*)", ADDRESS *", 12);
@@ -1062,7 +1062,7 @@ static void OPC_ProcPredefs (OPT_Object obj, INT8 vis)
 	}
 }
 
-static void OPC_Include (CHAR *name, LONGINT name__len)
+static void OPC_Include (CHAR *name, ADDRESS name__len)
 {
 	__DUP(name, name__len, CHAR);
 	OPM_WriteString((CHAR*)"#include ", 10);
@@ -1744,7 +1744,7 @@ static void OPC_CharacterLiteral (INT64 c)
 	}
 }
 
-static void OPC_StringLiteral (CHAR *s, LONGINT s__len, INT32 l)
+static void OPC_StringLiteral (CHAR *s, ADDRESS s__len, INT32 l)
 {
 	INT32 i;
 	INT16 c;
@@ -1912,9 +1912,9 @@ static struct InitKeywords__46 {
 	struct InitKeywords__46 *lnk;
 } *InitKeywords__46_s;
 
-static void Enter__47 (CHAR *s, LONGINT s__len);
+static void Enter__47 (CHAR *s, ADDRESS s__len);
 
-static void Enter__47 (CHAR *s, LONGINT s__len)
+static void Enter__47 (CHAR *s, ADDRESS s__len)
 {
 	INT16 h;
 	__DUP(s, s__len, CHAR);
diff --git a/bootstrap/windows-48/OPC.h b/bootstrap/windows-48/OPC.h
index 842e7dec..5624314d 100644
--- a/bootstrap/windows-48/OPC.h
+++ b/bootstrap/windows-48/OPC.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef OPC__h
 #define OPC__h
diff --git a/bootstrap/windows-48/OPM.c b/bootstrap/windows-48/OPM.c
index e76d763e..632b78e5 100644
--- a/bootstrap/windows-48/OPM.c
+++ b/bootstrap/windows-48/OPM.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
@@ -53,26 +53,26 @@ export void OPM_FPrintLReal (INT32 *fp, LONGREAL val);
 export void OPM_FPrintReal (INT32 *fp, REAL val);
 export void OPM_FPrintSet (INT32 *fp, UINT64 val);
 static void OPM_FindLine (Files_File f, Files_Rider *r, ADDRESS *r__typ, INT64 pos);
-static void OPM_FingerprintBytes (INT32 *fp, SYSTEM_BYTE *bytes, LONGINT bytes__len);
+static void OPM_FingerprintBytes (INT32 *fp, SYSTEM_BYTE *bytes, ADDRESS bytes__len);
 export void OPM_Get (CHAR *ch);
-export void OPM_Init (BOOLEAN *done, CHAR *mname, LONGINT mname__len);
+export void OPM_Init (BOOLEAN *done, CHAR *mname, ADDRESS mname__len);
 export void OPM_InitOptions (void);
 export INT16 OPM_Integer (INT64 n);
 static void OPM_LogErrMsg (INT16 n);
-export void OPM_LogVT100 (CHAR *vt100code, LONGINT vt100code__len);
+export void OPM_LogVT100 (CHAR *vt100code, ADDRESS vt100code__len);
 export void OPM_LogW (CHAR ch);
 export void OPM_LogWLn (void);
 export void OPM_LogWNum (INT64 i, INT64 len);
-export void OPM_LogWStr (CHAR *s, LONGINT s__len);
+export void OPM_LogWStr (CHAR *s, ADDRESS s__len);
 export INT32 OPM_Longint (INT64 n);
-static void OPM_MakeFileName (CHAR *name, LONGINT name__len, CHAR *FName, LONGINT FName__len, CHAR *ext, LONGINT ext__len);
+static void OPM_MakeFileName (CHAR *name, ADDRESS name__len, CHAR *FName, ADDRESS FName__len, CHAR *ext, ADDRESS ext__len);
 export void OPM_Mark (INT16 n, INT32 pos);
-export void OPM_NewSym (CHAR *modName, LONGINT modName__len);
-export void OPM_OldSym (CHAR *modName, LONGINT modName__len, BOOLEAN *done);
-export void OPM_OpenFiles (CHAR *moduleName, LONGINT moduleName__len);
+export void OPM_NewSym (CHAR *modName, ADDRESS modName__len);
+export void OPM_OldSym (CHAR *modName, ADDRESS modName__len, BOOLEAN *done);
+export void OPM_OpenFiles (CHAR *moduleName, ADDRESS moduleName__len);
 export BOOLEAN OPM_OpenPar (void);
 export void OPM_RegisterNewSym (void);
-static void OPM_ScanOptions (CHAR *s, LONGINT s__len);
+static void OPM_ScanOptions (CHAR *s, ADDRESS s__len);
 static void OPM_ShowLine (INT64 pos);
 export INT64 OPM_SignedMaximum (INT32 bytecount);
 export INT64 OPM_SignedMinimum (INT32 bytecount);
@@ -93,8 +93,8 @@ export void OPM_WriteHex (INT64 i);
 export void OPM_WriteInt (INT64 i);
 export void OPM_WriteLn (void);
 export void OPM_WriteReal (LONGREAL r, CHAR suffx);
-export void OPM_WriteString (CHAR *s, LONGINT s__len);
-export void OPM_WriteStringVar (CHAR *s, LONGINT s__len);
+export void OPM_WriteString (CHAR *s, ADDRESS s__len);
+export void OPM_WriteStringVar (CHAR *s, ADDRESS s__len);
 export BOOLEAN OPM_eofSF (void);
 export void OPM_err (INT16 n);
 
@@ -105,7 +105,7 @@ void OPM_LogW (CHAR ch)
 	Out_Char(ch);
 }
 
-void OPM_LogWStr (CHAR *s, LONGINT s__len)
+void OPM_LogWStr (CHAR *s, ADDRESS s__len)
 {
 	__DUP(s, s__len, CHAR);
 	Out_String(s, s__len);
@@ -122,7 +122,7 @@ void OPM_LogWLn (void)
 	Out_Ln();
 }
 
-void OPM_LogVT100 (CHAR *vt100code, LONGINT vt100code__len)
+void OPM_LogVT100 (CHAR *vt100code, ADDRESS vt100code__len)
 {
 	__DUP(vt100code, vt100code__len, CHAR);
 	if ((Out_IsConsole && !__IN(16, OPM_Options, 32))) {
@@ -154,7 +154,7 @@ INT16 OPM_Integer (INT64 n)
 	return __VAL(INT16, n);
 }
 
-static void OPM_ScanOptions (CHAR *s, LONGINT s__len)
+static void OPM_ScanOptions (CHAR *s, ADDRESS s__len)
 {
 	INT16 i;
 	__DUP(s, s__len, CHAR);
@@ -465,7 +465,7 @@ void OPM_InitOptions (void)
 	Files_SetSearchPath(searchpath, 1024);
 }
 
-void OPM_Init (BOOLEAN *done, CHAR *mname, LONGINT mname__len)
+void OPM_Init (BOOLEAN *done, CHAR *mname, ADDRESS mname__len)
 {
 	Texts_Text T = NIL;
 	INT32 beg, end, time;
@@ -514,7 +514,7 @@ void OPM_Get (CHAR *ch)
 	}
 }
 
-static void OPM_MakeFileName (CHAR *name, LONGINT name__len, CHAR *FName, LONGINT FName__len, CHAR *ext, LONGINT ext__len)
+static void OPM_MakeFileName (CHAR *name, ADDRESS name__len, CHAR *FName, ADDRESS FName__len, CHAR *ext, ADDRESS ext__len)
 {
 	INT16 i, j;
 	CHAR ch;
@@ -700,7 +700,7 @@ void OPM_err (INT16 n)
 	OPM_Mark(n, OPM_errpos);
 }
 
-static void OPM_FingerprintBytes (INT32 *fp, SYSTEM_BYTE *bytes, LONGINT bytes__len)
+static void OPM_FingerprintBytes (INT32 *fp, SYSTEM_BYTE *bytes, ADDRESS bytes__len)
 {
 	INT16 i;
 	INT32 l;
@@ -772,7 +772,7 @@ void OPM_CloseOldSym (void)
 	Files_Close(Files_Base(&OPM_oldSF, Files_Rider__typ));
 }
 
-void OPM_OldSym (CHAR *modName, LONGINT modName__len, BOOLEAN *done)
+void OPM_OldSym (CHAR *modName, ADDRESS modName__len, BOOLEAN *done)
 {
 	CHAR tag, ver;
 	OPM_FileName fileName;
@@ -832,7 +832,7 @@ void OPM_DeleteNewSym (void)
 {
 }
 
-void OPM_NewSym (CHAR *modName, LONGINT modName__len)
+void OPM_NewSym (CHAR *modName, ADDRESS modName__len)
 {
 	OPM_FileName fileName;
 	OPM_MakeFileName((void*)modName, modName__len, (void*)fileName, 32, (CHAR*)".sym", 5);
@@ -851,7 +851,7 @@ void OPM_Write (CHAR ch)
 	Files_Write(&OPM_R[__X(OPM_currFile, 3)], Files_Rider__typ, ch);
 }
 
-void OPM_WriteString (CHAR *s, LONGINT s__len)
+void OPM_WriteString (CHAR *s, ADDRESS s__len)
 {
 	INT16 i;
 	i = 0;
@@ -861,7 +861,7 @@ void OPM_WriteString (CHAR *s, LONGINT s__len)
 	Files_WriteBytes(&OPM_R[__X(OPM_currFile, 3)], Files_Rider__typ, (void*)s, s__len * 1, i);
 }
 
-void OPM_WriteStringVar (CHAR *s, LONGINT s__len)
+void OPM_WriteStringVar (CHAR *s, ADDRESS s__len)
 {
 	INT16 i;
 	i = 0;
@@ -986,7 +986,7 @@ static void OPM_Append (Files_Rider *R, ADDRESS *R__typ, Files_File F)
 	}
 }
 
-void OPM_OpenFiles (CHAR *moduleName, LONGINT moduleName__len)
+void OPM_OpenFiles (CHAR *moduleName, ADDRESS moduleName__len)
 {
 	CHAR FName[32];
 	__COPY(moduleName, OPM_modName, 32);
diff --git a/bootstrap/windows-48/OPM.h b/bootstrap/windows-48/OPM.h
index 2d272feb..c310c421 100644
--- a/bootstrap/windows-48/OPM.h
+++ b/bootstrap/windows-48/OPM.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef OPM__h
 #define OPM__h
@@ -28,19 +28,19 @@ import void OPM_FPrintLReal (INT32 *fp, LONGREAL val);
 import void OPM_FPrintReal (INT32 *fp, REAL val);
 import void OPM_FPrintSet (INT32 *fp, UINT64 val);
 import void OPM_Get (CHAR *ch);
-import void OPM_Init (BOOLEAN *done, CHAR *mname, LONGINT mname__len);
+import void OPM_Init (BOOLEAN *done, CHAR *mname, ADDRESS mname__len);
 import void OPM_InitOptions (void);
 import INT16 OPM_Integer (INT64 n);
-import void OPM_LogVT100 (CHAR *vt100code, LONGINT vt100code__len);
+import void OPM_LogVT100 (CHAR *vt100code, ADDRESS vt100code__len);
 import void OPM_LogW (CHAR ch);
 import void OPM_LogWLn (void);
 import void OPM_LogWNum (INT64 i, INT64 len);
-import void OPM_LogWStr (CHAR *s, LONGINT s__len);
+import void OPM_LogWStr (CHAR *s, ADDRESS s__len);
 import INT32 OPM_Longint (INT64 n);
 import void OPM_Mark (INT16 n, INT32 pos);
-import void OPM_NewSym (CHAR *modName, LONGINT modName__len);
-import void OPM_OldSym (CHAR *modName, LONGINT modName__len, BOOLEAN *done);
-import void OPM_OpenFiles (CHAR *moduleName, LONGINT moduleName__len);
+import void OPM_NewSym (CHAR *modName, ADDRESS modName__len);
+import void OPM_OldSym (CHAR *modName, ADDRESS modName__len, BOOLEAN *done);
+import void OPM_OpenFiles (CHAR *moduleName, ADDRESS moduleName__len);
 import BOOLEAN OPM_OpenPar (void);
 import void OPM_RegisterNewSym (void);
 import INT64 OPM_SignedMaximum (INT32 bytecount);
@@ -61,8 +61,8 @@ import void OPM_WriteHex (INT64 i);
 import void OPM_WriteInt (INT64 i);
 import void OPM_WriteLn (void);
 import void OPM_WriteReal (LONGREAL r, CHAR suffx);
-import void OPM_WriteString (CHAR *s, LONGINT s__len);
-import void OPM_WriteStringVar (CHAR *s, LONGINT s__len);
+import void OPM_WriteString (CHAR *s, ADDRESS s__len);
+import void OPM_WriteStringVar (CHAR *s, ADDRESS s__len);
 import BOOLEAN OPM_eofSF (void);
 import void OPM_err (INT16 n);
 import void *OPM__init(void);
diff --git a/bootstrap/windows-48/OPP.c b/bootstrap/windows-48/OPP.c
index 3f360d00..02fd6337 100644
--- a/bootstrap/windows-48/OPP.c
+++ b/bootstrap/windows-48/OPP.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/windows-48/OPP.h b/bootstrap/windows-48/OPP.h
index 5a71eb39..acb2df91 100644
--- a/bootstrap/windows-48/OPP.h
+++ b/bootstrap/windows-48/OPP.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef OPP__h
 #define OPP__h
diff --git a/bootstrap/windows-48/OPS.c b/bootstrap/windows-48/OPS.c
index 6ee700e5..7aedbbd6 100644
--- a/bootstrap/windows-48/OPS.c
+++ b/bootstrap/windows-48/OPS.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. tspaSF */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. tspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/windows-48/OPS.h b/bootstrap/windows-48/OPS.h
index 1f7a3e58..e49c222b 100644
--- a/bootstrap/windows-48/OPS.h
+++ b/bootstrap/windows-48/OPS.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. tspaSF */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. tspaSF */
 
 #ifndef OPS__h
 #define OPS__h
diff --git a/bootstrap/windows-48/OPT.c b/bootstrap/windows-48/OPT.c
index 75820a95..1eb85a06 100644
--- a/bootstrap/windows-48/OPT.c
+++ b/bootstrap/windows-48/OPT.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
@@ -120,7 +120,7 @@ static void OPT_EnterTyp (OPS_Name name, INT8 form, INT16 size, OPT_Struct *res)
 static void OPT_EnterTypeAlias (OPS_Name name, OPT_Object *res);
 export void OPT_Export (BOOLEAN *ext, BOOLEAN *new);
 export void OPT_FPrintErr (OPT_Object obj, INT16 errcode);
-static void OPT_FPrintName (INT32 *fp, CHAR *name, LONGINT name__len);
+static void OPT_FPrintName (INT32 *fp, CHAR *name, ADDRESS name__len);
 export void OPT_FPrintObj (OPT_Object obj);
 static void OPT_FPrintSign (INT32 *fp, OPT_Struct result, OPT_Object par);
 export void OPT_FPrintStr (OPT_Struct typ);
@@ -132,7 +132,7 @@ export void OPT_Import (OPS_Name aliasName, OPS_Name name, BOOLEAN *done);
 static void OPT_InConstant (INT32 f, OPT_Const conval);
 static OPT_Object OPT_InFld (void);
 static void OPT_InMod (INT8 *mno);
-static void OPT_InName (CHAR *name, LONGINT name__len);
+static void OPT_InName (CHAR *name, ADDRESS name__len);
 static OPT_Object OPT_InObj (INT8 mno);
 static void OPT_InSign (INT8 mno, OPT_Struct *res, OPT_Object *par);
 static void OPT_InStruct (OPT_Struct *typ);
@@ -155,7 +155,7 @@ static void OPT_OutConstant (OPT_Object obj);
 static void OPT_OutFlds (OPT_Object fld, INT32 adr, BOOLEAN visible);
 static void OPT_OutHdFld (OPT_Struct typ, OPT_Object fld, INT32 adr);
 static void OPT_OutMod (INT16 mno);
-static void OPT_OutName (CHAR *name, LONGINT name__len);
+static void OPT_OutName (CHAR *name, ADDRESS name__len);
 static void OPT_OutObj (OPT_Object obj);
 static void OPT_OutSign (OPT_Struct result, OPT_Object par);
 static void OPT_OutStr (OPT_Struct typ);
@@ -576,7 +576,7 @@ void OPT_Insert (OPS_Name name, OPT_Object *obj)
 	*obj = ob1;
 }
 
-static void OPT_FPrintName (INT32 *fp, CHAR *name, LONGINT name__len)
+static void OPT_FPrintName (INT32 *fp, CHAR *name, ADDRESS name__len)
 {
 	INT16 i;
 	CHAR ch;
@@ -957,7 +957,7 @@ void OPT_InsertImport (OPT_Object obj, OPT_Object *root, OPT_Object *old)
 	}
 }
 
-static void OPT_InName (CHAR *name, LONGINT name__len)
+static void OPT_InName (CHAR *name, ADDRESS name__len)
 {
 	INT16 i;
 	CHAR ch;
@@ -1483,7 +1483,7 @@ void OPT_Import (OPS_Name aliasName, OPS_Name name, BOOLEAN *done)
 	}
 }
 
-static void OPT_OutName (CHAR *name, LONGINT name__len)
+static void OPT_OutName (CHAR *name, ADDRESS name__len)
 {
 	INT16 i;
 	CHAR ch;
diff --git a/bootstrap/windows-48/OPT.h b/bootstrap/windows-48/OPT.h
index 90fcacf5..9d34cea9 100644
--- a/bootstrap/windows-48/OPT.h
+++ b/bootstrap/windows-48/OPT.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef OPT__h
 #define OPT__h
diff --git a/bootstrap/windows-48/OPV.c b/bootstrap/windows-48/OPV.c
index 5c21cb97..f6d42592 100644
--- a/bootstrap/windows-48/OPV.c
+++ b/bootstrap/windows-48/OPV.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/windows-48/OPV.h b/bootstrap/windows-48/OPV.h
index c4a61586..0f1980ac 100644
--- a/bootstrap/windows-48/OPV.h
+++ b/bootstrap/windows-48/OPV.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef OPV__h
 #define OPV__h
diff --git a/bootstrap/windows-48/Out.c b/bootstrap/windows-48/Out.c
index 720267fd..de9a7701 100644
--- a/bootstrap/windows-48/Out.c
+++ b/bootstrap/windows-48/Out.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
@@ -17,16 +17,16 @@ static INT16 Out_in;
 export void Out_Char (CHAR ch);
 export void Out_Flush (void);
 export void Out_Int (INT64 x, INT64 n);
-static INT32 Out_Length (CHAR *s, LONGINT s__len);
+static INT32 Out_Length (CHAR *s, ADDRESS s__len);
 export void Out_Ln (void);
 export void Out_LongReal (LONGREAL x, INT16 n);
 export void Out_Open (void);
 export void Out_Real (REAL x, INT16 n);
 static void Out_RealP (LONGREAL x, INT16 n, BOOLEAN long_);
-export void Out_String (CHAR *str, LONGINT str__len);
+export void Out_String (CHAR *str, ADDRESS str__len);
 export LONGREAL Out_Ten (INT16 e);
-static void Out_digit (INT64 n, CHAR *s, LONGINT s__len, INT16 *i);
-static void Out_prepend (CHAR *t, LONGINT t__len, CHAR *s, LONGINT s__len, INT16 *i);
+static void Out_digit (INT64 n, CHAR *s, ADDRESS s__len, INT16 *i);
+static void Out_prepend (CHAR *t, ADDRESS t__len, CHAR *s, ADDRESS s__len, INT16 *i);
 
 #define Out_Entier64(x)	(INT64)(x)
 
@@ -55,7 +55,7 @@ void Out_Char (CHAR ch)
 	}
 }
 
-static INT32 Out_Length (CHAR *s, LONGINT s__len)
+static INT32 Out_Length (CHAR *s, ADDRESS s__len)
 {
 	INT32 l;
 	l = 0;
@@ -65,7 +65,7 @@ static INT32 Out_Length (CHAR *s, LONGINT s__len)
 	return l;
 }
 
-void Out_String (CHAR *str, LONGINT str__len)
+void Out_String (CHAR *str, ADDRESS str__len)
 {
 	INT32 l;
 	INT16 error;
@@ -125,13 +125,13 @@ void Out_Ln (void)
 	Out_Flush();
 }
 
-static void Out_digit (INT64 n, CHAR *s, LONGINT s__len, INT16 *i)
+static void Out_digit (INT64 n, CHAR *s, ADDRESS s__len, INT16 *i)
 {
 	*i -= 1;
 	s[__X(*i, s__len)] = (CHAR)(__MOD(n, 10) + 48);
 }
 
-static void Out_prepend (CHAR *t, LONGINT t__len, CHAR *s, LONGINT s__len, INT16 *i)
+static void Out_prepend (CHAR *t, ADDRESS t__len, CHAR *s, ADDRESS s__len, INT16 *i)
 {
 	INT16 j;
 	INT32 l;
diff --git a/bootstrap/windows-48/Out.h b/bootstrap/windows-48/Out.h
index 0e66420d..d58a17d5 100644
--- a/bootstrap/windows-48/Out.h
+++ b/bootstrap/windows-48/Out.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef Out__h
 #define Out__h
@@ -16,7 +16,7 @@ import void Out_Ln (void);
 import void Out_LongReal (LONGREAL x, INT16 n);
 import void Out_Open (void);
 import void Out_Real (REAL x, INT16 n);
-import void Out_String (CHAR *str, LONGINT str__len);
+import void Out_String (CHAR *str, ADDRESS str__len);
 import LONGREAL Out_Ten (INT16 e);
 import void *Out__init(void);
 
diff --git a/bootstrap/windows-48/Platform.c b/bootstrap/windows-48/Platform.c
index 5a57f076..2d035abe 100644
--- a/bootstrap/windows-48/Platform.c
+++ b/bootstrap/windows-48/Platform.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
@@ -48,8 +48,8 @@ export CHAR Platform_NL[3];
 export ADDRESS *Platform_FileIdentity__typ;
 
 export BOOLEAN Platform_Absent (INT16 e);
-export INT16 Platform_ArgPos (CHAR *s, LONGINT s__len);
-export INT16 Platform_Chdir (CHAR *n, LONGINT n__len);
+export INT16 Platform_ArgPos (CHAR *s, ADDRESS s__len);
+export INT16 Platform_Chdir (CHAR *n, ADDRESS n__len);
 export INT16 Platform_Close (INT32 h);
 export BOOLEAN Platform_ConnectionFailed (INT16 e);
 export void Platform_Delay (INT32 ms);
@@ -57,27 +57,27 @@ export BOOLEAN Platform_DifferentFilesystems (INT16 e);
 static void Platform_EnableVT100 (void);
 export INT16 Platform_Error (void);
 export void Platform_Exit (INT32 code);
-export void Platform_GetArg (INT16 n, CHAR *val, LONGINT val__len);
+export void Platform_GetArg (INT16 n, CHAR *val, ADDRESS val__len);
 export void Platform_GetClock (INT32 *t, INT32 *d);
-export void Platform_GetEnv (CHAR *var, LONGINT var__len, CHAR *val, LONGINT val__len);
+export void Platform_GetEnv (CHAR *var, ADDRESS var__len, CHAR *val, ADDRESS val__len);
 export void Platform_GetIntArg (INT16 n, INT32 *val);
 export void Platform_GetTimeOfDay (INT32 *sec, INT32 *usec);
 export INT16 Platform_Identify (INT32 h, Platform_FileIdentity *identity, ADDRESS *identity__typ);
-export INT16 Platform_IdentifyByName (CHAR *n, LONGINT n__len, Platform_FileIdentity *identity, ADDRESS *identity__typ);
+export INT16 Platform_IdentifyByName (CHAR *n, ADDRESS n__len, Platform_FileIdentity *identity, ADDRESS *identity__typ);
 export BOOLEAN Platform_Inaccessible (INT16 e);
 export void Platform_Init (INT32 argc, INT32 argvadr);
 export BOOLEAN Platform_Interrupted (INT16 e);
 export BOOLEAN Platform_IsConsole (INT32 h);
 export void Platform_MTimeAsClock (Platform_FileIdentity i, INT32 *t, INT32 *d);
-export INT16 Platform_New (CHAR *n, LONGINT n__len, INT32 *h);
+export INT16 Platform_New (CHAR *n, ADDRESS n__len, INT32 *h);
 export BOOLEAN Platform_NoSuchDirectory (INT16 e);
 export INT32 Platform_OSAllocate (INT32 size);
 export void Platform_OSFree (INT32 address);
-export INT16 Platform_OldRO (CHAR *n, LONGINT n__len, INT32 *h);
-export INT16 Platform_OldRW (CHAR *n, LONGINT n__len, INT32 *h);
+export INT16 Platform_OldRO (CHAR *n, ADDRESS n__len, INT32 *h);
+export INT16 Platform_OldRW (CHAR *n, ADDRESS n__len, INT32 *h);
 export INT16 Platform_Read (INT32 h, INT32 p, INT32 l, INT32 *n);
-export INT16 Platform_ReadBuf (INT32 h, SYSTEM_BYTE *b, LONGINT b__len, INT32 *n);
-export INT16 Platform_Rename (CHAR *o, LONGINT o__len, CHAR *n, LONGINT n__len);
+export INT16 Platform_ReadBuf (INT32 h, SYSTEM_BYTE *b, ADDRESS b__len, INT32 *n);
+export INT16 Platform_Rename (CHAR *o, ADDRESS o__len, CHAR *n, ADDRESS n__len);
 export BOOLEAN Platform_SameFile (Platform_FileIdentity i1, Platform_FileIdentity i2);
 export BOOLEAN Platform_SameFileTime (Platform_FileIdentity i1, Platform_FileIdentity i2);
 export INT16 Platform_Seek (INT32 h, INT32 o, INT16 r);
@@ -85,16 +85,16 @@ export void Platform_SetBadInstructionHandler (Platform_SignalHandler handler);
 export void Platform_SetMTime (Platform_FileIdentity *target, ADDRESS *target__typ, Platform_FileIdentity source);
 export INT16 Platform_Size (INT32 h, INT32 *l);
 export INT16 Platform_Sync (INT32 h);
-export INT16 Platform_System (CHAR *cmd, LONGINT cmd__len);
+export INT16 Platform_System (CHAR *cmd, ADDRESS cmd__len);
 static void Platform_TestLittleEndian (void);
 export INT32 Platform_Time (void);
 export BOOLEAN Platform_TimedOut (INT16 e);
 export BOOLEAN Platform_TooManyFiles (INT16 e);
 export INT16 Platform_Truncate (INT32 h, INT32 limit);
-export INT16 Platform_Unlink (CHAR *n, LONGINT n__len);
+export INT16 Platform_Unlink (CHAR *n, ADDRESS n__len);
 export INT16 Platform_Write (INT32 h, INT32 p, INT32 l);
 static void Platform_YMDHMStoClock (INT16 ye, INT16 mo, INT16 da, INT16 ho, INT16 mi, INT16 se, INT32 *t, INT32 *d);
-export BOOLEAN Platform_getEnv (CHAR *var, LONGINT var__len, CHAR *val, LONGINT val__len);
+export BOOLEAN Platform_getEnv (CHAR *var, ADDRESS var__len, CHAR *val, ADDRESS val__len);
 
 #include "WindowsWrapper.h"
 #define Platform_ECONNABORTED()	WSAECONNABORTED
@@ -239,7 +239,7 @@ void Platform_Init (INT32 argc, INT32 argvadr)
 	Platform_HeapInitHeap();
 }
 
-BOOLEAN Platform_getEnv (CHAR *var, LONGINT var__len, CHAR *val, LONGINT val__len)
+BOOLEAN Platform_getEnv (CHAR *var, ADDRESS var__len, CHAR *val, ADDRESS val__len)
 {
 	CHAR buf[4096];
 	INT16 res;
@@ -256,7 +256,7 @@ BOOLEAN Platform_getEnv (CHAR *var, LONGINT var__len, CHAR *val, LONGINT val__le
 	__RETCHK;
 }
 
-void Platform_GetEnv (CHAR *var, LONGINT var__len, CHAR *val, LONGINT val__len)
+void Platform_GetEnv (CHAR *var, ADDRESS var__len, CHAR *val, ADDRESS val__len)
 {
 	__DUP(var, var__len, CHAR);
 	if (!Platform_getEnv(var, var__len, (void*)val, val__len)) {
@@ -265,7 +265,7 @@ void Platform_GetEnv (CHAR *var, LONGINT var__len, CHAR *val, LONGINT val__len)
 	__DEL(var);
 }
 
-void Platform_GetArg (INT16 n, CHAR *val, LONGINT val__len)
+void Platform_GetArg (INT16 n, CHAR *val, ADDRESS val__len)
 {
 	Platform_ArgVec av = NIL;
 	if (n < Platform_ArgCount) {
@@ -300,7 +300,7 @@ void Platform_GetIntArg (INT16 n, INT32 *val)
 	}
 }
 
-INT16 Platform_ArgPos (CHAR *s, LONGINT s__len)
+INT16 Platform_ArgPos (CHAR *s, ADDRESS s__len)
 {
 	INT16 i;
 	CHAR arg[256];
@@ -359,7 +359,7 @@ void Platform_GetTimeOfDay (INT32 *sec, INT32 *usec)
 	*usec = Platform_uluSec();
 }
 
-INT16 Platform_System (CHAR *cmd, LONGINT cmd__len)
+INT16 Platform_System (CHAR *cmd, ADDRESS cmd__len)
 {
 	INT16 result;
 	__DUP(cmd, cmd__len, CHAR);
@@ -381,7 +381,7 @@ INT16 Platform_Error (void)
 	return Platform_err();
 }
 
-INT16 Platform_OldRO (CHAR *n, LONGINT n__len, INT32 *h)
+INT16 Platform_OldRO (CHAR *n, ADDRESS n__len, INT32 *h)
 {
 	INT32 fd;
 	fd = Platform_openro(n, n__len);
@@ -394,7 +394,7 @@ INT16 Platform_OldRO (CHAR *n, LONGINT n__len, INT32 *h)
 	__RETCHK;
 }
 
-INT16 Platform_OldRW (CHAR *n, LONGINT n__len, INT32 *h)
+INT16 Platform_OldRW (CHAR *n, ADDRESS n__len, INT32 *h)
 {
 	INT32 fd;
 	fd = Platform_openrw(n, n__len);
@@ -407,7 +407,7 @@ INT16 Platform_OldRW (CHAR *n, LONGINT n__len, INT32 *h)
 	__RETCHK;
 }
 
-INT16 Platform_New (CHAR *n, LONGINT n__len, INT32 *h)
+INT16 Platform_New (CHAR *n, ADDRESS n__len, INT32 *h)
 {
 	INT32 fd;
 	fd = Platform_opennew(n, n__len);
@@ -444,7 +444,7 @@ INT16 Platform_Identify (INT32 h, Platform_FileIdentity *identity, ADDRESS *iden
 	return 0;
 }
 
-INT16 Platform_IdentifyByName (CHAR *n, LONGINT n__len, Platform_FileIdentity *identity, ADDRESS *identity__typ)
+INT16 Platform_IdentifyByName (CHAR *n, ADDRESS n__len, Platform_FileIdentity *identity, ADDRESS *identity__typ)
 {
 	INT32 h;
 	INT16 e, i;
@@ -508,7 +508,7 @@ INT16 Platform_Read (INT32 h, INT32 p, INT32 l, INT32 *n)
 	__RETCHK;
 }
 
-INT16 Platform_ReadBuf (INT32 h, SYSTEM_BYTE *b, LONGINT b__len, INT32 *n)
+INT16 Platform_ReadBuf (INT32 h, SYSTEM_BYTE *b, ADDRESS b__len, INT32 *n)
 {
 	INT16 result;
 	INT32 lengthread;
@@ -580,7 +580,7 @@ INT16 Platform_Truncate (INT32 h, INT32 limit)
 	return 0;
 }
 
-INT16 Platform_Unlink (CHAR *n, LONGINT n__len)
+INT16 Platform_Unlink (CHAR *n, ADDRESS n__len)
 {
 	if (Platform_deleteFile(n, n__len) == 0) {
 		return Platform_err();
@@ -590,7 +590,7 @@ INT16 Platform_Unlink (CHAR *n, LONGINT n__len)
 	__RETCHK;
 }
 
-INT16 Platform_Chdir (CHAR *n, LONGINT n__len)
+INT16 Platform_Chdir (CHAR *n, ADDRESS n__len)
 {
 	INT16 r;
 	r = Platform_setCurrentDirectory(n, n__len);
@@ -601,7 +601,7 @@ INT16 Platform_Chdir (CHAR *n, LONGINT n__len)
 	return 0;
 }
 
-INT16 Platform_Rename (CHAR *o, LONGINT o__len, CHAR *n, LONGINT n__len)
+INT16 Platform_Rename (CHAR *o, ADDRESS o__len, CHAR *n, ADDRESS n__len)
 {
 	if (Platform_moveFile(o, o__len, n, n__len) == 0) {
 		return Platform_err();
diff --git a/bootstrap/windows-48/Platform.h b/bootstrap/windows-48/Platform.h
index f62a8ab8..3f6520f3 100644
--- a/bootstrap/windows-48/Platform.h
+++ b/bootstrap/windows-48/Platform.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef Platform__h
 #define Platform__h
@@ -29,35 +29,35 @@ import CHAR Platform_NL[3];
 import ADDRESS *Platform_FileIdentity__typ;
 
 import BOOLEAN Platform_Absent (INT16 e);
-import INT16 Platform_ArgPos (CHAR *s, LONGINT s__len);
-import INT16 Platform_Chdir (CHAR *n, LONGINT n__len);
+import INT16 Platform_ArgPos (CHAR *s, ADDRESS s__len);
+import INT16 Platform_Chdir (CHAR *n, ADDRESS n__len);
 import INT16 Platform_Close (INT32 h);
 import BOOLEAN Platform_ConnectionFailed (INT16 e);
 import void Platform_Delay (INT32 ms);
 import BOOLEAN Platform_DifferentFilesystems (INT16 e);
 import INT16 Platform_Error (void);
 import void Platform_Exit (INT32 code);
-import void Platform_GetArg (INT16 n, CHAR *val, LONGINT val__len);
+import void Platform_GetArg (INT16 n, CHAR *val, ADDRESS val__len);
 import void Platform_GetClock (INT32 *t, INT32 *d);
-import void Platform_GetEnv (CHAR *var, LONGINT var__len, CHAR *val, LONGINT val__len);
+import void Platform_GetEnv (CHAR *var, ADDRESS var__len, CHAR *val, ADDRESS val__len);
 import void Platform_GetIntArg (INT16 n, INT32 *val);
 import void Platform_GetTimeOfDay (INT32 *sec, INT32 *usec);
 import INT16 Platform_Identify (INT32 h, Platform_FileIdentity *identity, ADDRESS *identity__typ);
-import INT16 Platform_IdentifyByName (CHAR *n, LONGINT n__len, Platform_FileIdentity *identity, ADDRESS *identity__typ);
+import INT16 Platform_IdentifyByName (CHAR *n, ADDRESS n__len, Platform_FileIdentity *identity, ADDRESS *identity__typ);
 import BOOLEAN Platform_Inaccessible (INT16 e);
 import void Platform_Init (INT32 argc, INT32 argvadr);
 import BOOLEAN Platform_Interrupted (INT16 e);
 import BOOLEAN Platform_IsConsole (INT32 h);
 import void Platform_MTimeAsClock (Platform_FileIdentity i, INT32 *t, INT32 *d);
-import INT16 Platform_New (CHAR *n, LONGINT n__len, INT32 *h);
+import INT16 Platform_New (CHAR *n, ADDRESS n__len, INT32 *h);
 import BOOLEAN Platform_NoSuchDirectory (INT16 e);
 import INT32 Platform_OSAllocate (INT32 size);
 import void Platform_OSFree (INT32 address);
-import INT16 Platform_OldRO (CHAR *n, LONGINT n__len, INT32 *h);
-import INT16 Platform_OldRW (CHAR *n, LONGINT n__len, INT32 *h);
+import INT16 Platform_OldRO (CHAR *n, ADDRESS n__len, INT32 *h);
+import INT16 Platform_OldRW (CHAR *n, ADDRESS n__len, INT32 *h);
 import INT16 Platform_Read (INT32 h, INT32 p, INT32 l, INT32 *n);
-import INT16 Platform_ReadBuf (INT32 h, SYSTEM_BYTE *b, LONGINT b__len, INT32 *n);
-import INT16 Platform_Rename (CHAR *o, LONGINT o__len, CHAR *n, LONGINT n__len);
+import INT16 Platform_ReadBuf (INT32 h, SYSTEM_BYTE *b, ADDRESS b__len, INT32 *n);
+import INT16 Platform_Rename (CHAR *o, ADDRESS o__len, CHAR *n, ADDRESS n__len);
 import BOOLEAN Platform_SameFile (Platform_FileIdentity i1, Platform_FileIdentity i2);
 import BOOLEAN Platform_SameFileTime (Platform_FileIdentity i1, Platform_FileIdentity i2);
 import INT16 Platform_Seek (INT32 h, INT32 o, INT16 r);
@@ -65,14 +65,14 @@ import void Platform_SetBadInstructionHandler (Platform_SignalHandler handler);
 import void Platform_SetMTime (Platform_FileIdentity *target, ADDRESS *target__typ, Platform_FileIdentity source);
 import INT16 Platform_Size (INT32 h, INT32 *l);
 import INT16 Platform_Sync (INT32 h);
-import INT16 Platform_System (CHAR *cmd, LONGINT cmd__len);
+import INT16 Platform_System (CHAR *cmd, ADDRESS cmd__len);
 import INT32 Platform_Time (void);
 import BOOLEAN Platform_TimedOut (INT16 e);
 import BOOLEAN Platform_TooManyFiles (INT16 e);
 import INT16 Platform_Truncate (INT32 h, INT32 limit);
-import INT16 Platform_Unlink (CHAR *n, LONGINT n__len);
+import INT16 Platform_Unlink (CHAR *n, ADDRESS n__len);
 import INT16 Platform_Write (INT32 h, INT32 p, INT32 l);
-import BOOLEAN Platform_getEnv (CHAR *var, LONGINT var__len, CHAR *val, LONGINT val__len);
+import BOOLEAN Platform_getEnv (CHAR *var, ADDRESS var__len, CHAR *val, ADDRESS val__len);
 import void *Platform__init(void);
 
 #define Platform_SetInterruptHandler(h)	SystemSetInterruptHandler((ADDRESS)h)
diff --git a/bootstrap/windows-48/Reals.c b/bootstrap/windows-48/Reals.c
index cd4c3c61..be3ad909 100644
--- a/bootstrap/windows-48/Reals.c
+++ b/bootstrap/windows-48/Reals.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
@@ -10,11 +10,11 @@
 
 
 
-static void Reals_BytesToHex (SYSTEM_BYTE *b, LONGINT b__len, SYSTEM_BYTE *d, LONGINT d__len);
-export void Reals_Convert (REAL x, INT16 n, CHAR *d, LONGINT d__len);
-export void Reals_ConvertH (REAL y, CHAR *d, LONGINT d__len);
-export void Reals_ConvertHL (LONGREAL x, CHAR *d, LONGINT d__len);
-export void Reals_ConvertL (LONGREAL x, INT16 n, CHAR *d, LONGINT d__len);
+static void Reals_BytesToHex (SYSTEM_BYTE *b, ADDRESS b__len, SYSTEM_BYTE *d, ADDRESS d__len);
+export void Reals_Convert (REAL x, INT16 n, CHAR *d, ADDRESS d__len);
+export void Reals_ConvertH (REAL y, CHAR *d, ADDRESS d__len);
+export void Reals_ConvertHL (LONGREAL x, CHAR *d, ADDRESS d__len);
+export void Reals_ConvertL (LONGREAL x, INT16 n, CHAR *d, ADDRESS d__len);
 export INT16 Reals_Expo (REAL x);
 export INT16 Reals_ExpoL (LONGREAL x);
 export void Reals_SetExpo (REAL *x, INT16 ex);
@@ -79,7 +79,7 @@ INT16 Reals_ExpoL (LONGREAL x)
 	return __MASK(__ASHR(i, 4), -2048);
 }
 
-void Reals_ConvertL (LONGREAL x, INT16 n, CHAR *d, LONGINT d__len)
+void Reals_ConvertL (LONGREAL x, INT16 n, CHAR *d, ADDRESS d__len)
 {
 	INT32 i, j, k;
 	if (x < (LONGREAL)0) {
@@ -107,7 +107,7 @@ void Reals_ConvertL (LONGREAL x, INT16 n, CHAR *d, LONGINT d__len)
 	}
 }
 
-void Reals_Convert (REAL x, INT16 n, CHAR *d, LONGINT d__len)
+void Reals_Convert (REAL x, INT16 n, CHAR *d, ADDRESS d__len)
 {
 	Reals_ConvertL(x, n, (void*)d, d__len);
 }
@@ -122,7 +122,7 @@ static CHAR Reals_ToHex (INT16 i)
 	__RETCHK;
 }
 
-static void Reals_BytesToHex (SYSTEM_BYTE *b, LONGINT b__len, SYSTEM_BYTE *d, LONGINT d__len)
+static void Reals_BytesToHex (SYSTEM_BYTE *b, ADDRESS b__len, SYSTEM_BYTE *d, ADDRESS d__len)
 {
 	INT16 i;
 	INT32 l;
@@ -137,12 +137,12 @@ static void Reals_BytesToHex (SYSTEM_BYTE *b, LONGINT b__len, SYSTEM_BYTE *d, LO
 	}
 }
 
-void Reals_ConvertH (REAL y, CHAR *d, LONGINT d__len)
+void Reals_ConvertH (REAL y, CHAR *d, ADDRESS d__len)
 {
 	Reals_BytesToHex((void*)&y, 4, (void*)d, d__len * 1);
 }
 
-void Reals_ConvertHL (LONGREAL x, CHAR *d, LONGINT d__len)
+void Reals_ConvertHL (LONGREAL x, CHAR *d, ADDRESS d__len)
 {
 	Reals_BytesToHex((void*)&x, 8, (void*)d, d__len * 1);
 }
diff --git a/bootstrap/windows-48/Reals.h b/bootstrap/windows-48/Reals.h
index f0c84ab1..e8d15a2f 100644
--- a/bootstrap/windows-48/Reals.h
+++ b/bootstrap/windows-48/Reals.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef Reals__h
 #define Reals__h
@@ -8,10 +8,10 @@
 
 
 
-import void Reals_Convert (REAL x, INT16 n, CHAR *d, LONGINT d__len);
-import void Reals_ConvertH (REAL y, CHAR *d, LONGINT d__len);
-import void Reals_ConvertHL (LONGREAL x, CHAR *d, LONGINT d__len);
-import void Reals_ConvertL (LONGREAL x, INT16 n, CHAR *d, LONGINT d__len);
+import void Reals_Convert (REAL x, INT16 n, CHAR *d, ADDRESS d__len);
+import void Reals_ConvertH (REAL y, CHAR *d, ADDRESS d__len);
+import void Reals_ConvertHL (LONGREAL x, CHAR *d, ADDRESS d__len);
+import void Reals_ConvertL (LONGREAL x, INT16 n, CHAR *d, ADDRESS d__len);
 import INT16 Reals_Expo (REAL x);
 import INT16 Reals_ExpoL (LONGREAL x);
 import void Reals_SetExpo (REAL *x, INT16 ex);
diff --git a/bootstrap/windows-48/Strings.c b/bootstrap/windows-48/Strings.c
index b5707327..fd550df3 100644
--- a/bootstrap/windows-48/Strings.c
+++ b/bootstrap/windows-48/Strings.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
@@ -10,18 +10,18 @@
 
 
 
-export void Strings_Append (CHAR *extra, LONGINT extra__len, CHAR *dest, LONGINT dest__len);
-export void Strings_Cap (CHAR *s, LONGINT s__len);
-export void Strings_Delete (CHAR *s, LONGINT s__len, INT16 pos, INT16 n);
-export void Strings_Extract (CHAR *source, LONGINT source__len, INT16 pos, INT16 n, CHAR *dest, LONGINT dest__len);
-export void Strings_Insert (CHAR *source, LONGINT source__len, INT16 pos, CHAR *dest, LONGINT dest__len);
-export INT16 Strings_Length (CHAR *s, LONGINT s__len);
-export BOOLEAN Strings_Match (CHAR *string, LONGINT string__len, CHAR *pattern, LONGINT pattern__len);
-export INT16 Strings_Pos (CHAR *pattern, LONGINT pattern__len, CHAR *s, LONGINT s__len, INT16 pos);
-export void Strings_Replace (CHAR *source, LONGINT source__len, INT16 pos, CHAR *dest, LONGINT dest__len);
+export void Strings_Append (CHAR *extra, ADDRESS extra__len, CHAR *dest, ADDRESS dest__len);
+export void Strings_Cap (CHAR *s, ADDRESS s__len);
+export void Strings_Delete (CHAR *s, ADDRESS s__len, INT16 pos, INT16 n);
+export void Strings_Extract (CHAR *source, ADDRESS source__len, INT16 pos, INT16 n, CHAR *dest, ADDRESS dest__len);
+export void Strings_Insert (CHAR *source, ADDRESS source__len, INT16 pos, CHAR *dest, ADDRESS dest__len);
+export INT16 Strings_Length (CHAR *s, ADDRESS s__len);
+export BOOLEAN Strings_Match (CHAR *string, ADDRESS string__len, CHAR *pattern, ADDRESS pattern__len);
+export INT16 Strings_Pos (CHAR *pattern, ADDRESS pattern__len, CHAR *s, ADDRESS s__len, INT16 pos);
+export void Strings_Replace (CHAR *source, ADDRESS source__len, INT16 pos, CHAR *dest, ADDRESS dest__len);
 
 
-INT16 Strings_Length (CHAR *s, LONGINT s__len)
+INT16 Strings_Length (CHAR *s, ADDRESS s__len)
 {
 	INT32 i;
 	__DUP(s, s__len, CHAR);
@@ -39,7 +39,7 @@ INT16 Strings_Length (CHAR *s, LONGINT s__len)
 	__RETCHK;
 }
 
-void Strings_Append (CHAR *extra, LONGINT extra__len, CHAR *dest, LONGINT dest__len)
+void Strings_Append (CHAR *extra, ADDRESS extra__len, CHAR *dest, ADDRESS dest__len)
 {
 	INT16 n1, n2, i;
 	__DUP(extra, extra__len, CHAR);
@@ -56,7 +56,7 @@ void Strings_Append (CHAR *extra, LONGINT extra__len, CHAR *dest, LONGINT dest__
 	__DEL(extra);
 }
 
-void Strings_Insert (CHAR *source, LONGINT source__len, INT16 pos, CHAR *dest, LONGINT dest__len)
+void Strings_Insert (CHAR *source, ADDRESS source__len, INT16 pos, CHAR *dest, ADDRESS dest__len)
 {
 	INT16 n1, n2, i;
 	__DUP(source, source__len, CHAR);
@@ -87,7 +87,7 @@ void Strings_Insert (CHAR *source, LONGINT source__len, INT16 pos, CHAR *dest, L
 	__DEL(source);
 }
 
-void Strings_Delete (CHAR *s, LONGINT s__len, INT16 pos, INT16 n)
+void Strings_Delete (CHAR *s, ADDRESS s__len, INT16 pos, INT16 n)
 {
 	INT16 len, i;
 	len = Strings_Length(s, s__len);
@@ -110,7 +110,7 @@ void Strings_Delete (CHAR *s, LONGINT s__len, INT16 pos, INT16 n)
 	}
 }
 
-void Strings_Replace (CHAR *source, LONGINT source__len, INT16 pos, CHAR *dest, LONGINT dest__len)
+void Strings_Replace (CHAR *source, ADDRESS source__len, INT16 pos, CHAR *dest, ADDRESS dest__len)
 {
 	__DUP(source, source__len, CHAR);
 	Strings_Delete((void*)dest, dest__len, pos, pos + Strings_Length(source, source__len));
@@ -118,7 +118,7 @@ void Strings_Replace (CHAR *source, LONGINT source__len, INT16 pos, CHAR *dest,
 	__DEL(source);
 }
 
-void Strings_Extract (CHAR *source, LONGINT source__len, INT16 pos, INT16 n, CHAR *dest, LONGINT dest__len)
+void Strings_Extract (CHAR *source, ADDRESS source__len, INT16 pos, INT16 n, CHAR *dest, ADDRESS dest__len)
 {
 	INT16 len, destLen, i;
 	__DUP(source, source__len, CHAR);
@@ -143,7 +143,7 @@ void Strings_Extract (CHAR *source, LONGINT source__len, INT16 pos, INT16 n, CHA
 	__DEL(source);
 }
 
-INT16 Strings_Pos (CHAR *pattern, LONGINT pattern__len, CHAR *s, LONGINT s__len, INT16 pos)
+INT16 Strings_Pos (CHAR *pattern, ADDRESS pattern__len, CHAR *s, ADDRESS s__len, INT16 pos)
 {
 	INT16 n1, n2, i, j;
 	__DUP(pattern, pattern__len, CHAR);
@@ -175,7 +175,7 @@ INT16 Strings_Pos (CHAR *pattern, LONGINT pattern__len, CHAR *s, LONGINT s__len,
 	return -1;
 }
 
-void Strings_Cap (CHAR *s, LONGINT s__len)
+void Strings_Cap (CHAR *s, ADDRESS s__len)
 {
 	INT16 i;
 	i = 0;
@@ -191,9 +191,9 @@ static struct Match__7 {
 	struct Match__7 *lnk;
 } *Match__7_s;
 
-static BOOLEAN M__8 (CHAR *name, LONGINT name__len, CHAR *mask, LONGINT mask__len, INT16 n, INT16 m);
+static BOOLEAN M__8 (CHAR *name, ADDRESS name__len, CHAR *mask, ADDRESS mask__len, INT16 n, INT16 m);
 
-static BOOLEAN M__8 (CHAR *name, LONGINT name__len, CHAR *mask, LONGINT mask__len, INT16 n, INT16 m)
+static BOOLEAN M__8 (CHAR *name, ADDRESS name__len, CHAR *mask, ADDRESS mask__len, INT16 n, INT16 m)
 {
 	while ((((n >= 0 && m >= 0)) && mask[__X(m, mask__len)] != '*')) {
 		if (name[__X(n, name__len)] != mask[__X(m, mask__len)]) {
@@ -220,7 +220,7 @@ static BOOLEAN M__8 (CHAR *name, LONGINT name__len, CHAR *mask, LONGINT mask__le
 	return 0;
 }
 
-BOOLEAN Strings_Match (CHAR *string, LONGINT string__len, CHAR *pattern, LONGINT pattern__len)
+BOOLEAN Strings_Match (CHAR *string, ADDRESS string__len, CHAR *pattern, ADDRESS pattern__len)
 {
 	struct Match__7 _s;
 	BOOLEAN __retval;
diff --git a/bootstrap/windows-48/Strings.h b/bootstrap/windows-48/Strings.h
index c987af8d..76cb022d 100644
--- a/bootstrap/windows-48/Strings.h
+++ b/bootstrap/windows-48/Strings.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef Strings__h
 #define Strings__h
@@ -8,15 +8,15 @@
 
 
 
-import void Strings_Append (CHAR *extra, LONGINT extra__len, CHAR *dest, LONGINT dest__len);
-import void Strings_Cap (CHAR *s, LONGINT s__len);
-import void Strings_Delete (CHAR *s, LONGINT s__len, INT16 pos, INT16 n);
-import void Strings_Extract (CHAR *source, LONGINT source__len, INT16 pos, INT16 n, CHAR *dest, LONGINT dest__len);
-import void Strings_Insert (CHAR *source, LONGINT source__len, INT16 pos, CHAR *dest, LONGINT dest__len);
-import INT16 Strings_Length (CHAR *s, LONGINT s__len);
-import BOOLEAN Strings_Match (CHAR *string, LONGINT string__len, CHAR *pattern, LONGINT pattern__len);
-import INT16 Strings_Pos (CHAR *pattern, LONGINT pattern__len, CHAR *s, LONGINT s__len, INT16 pos);
-import void Strings_Replace (CHAR *source, LONGINT source__len, INT16 pos, CHAR *dest, LONGINT dest__len);
+import void Strings_Append (CHAR *extra, ADDRESS extra__len, CHAR *dest, ADDRESS dest__len);
+import void Strings_Cap (CHAR *s, ADDRESS s__len);
+import void Strings_Delete (CHAR *s, ADDRESS s__len, INT16 pos, INT16 n);
+import void Strings_Extract (CHAR *source, ADDRESS source__len, INT16 pos, INT16 n, CHAR *dest, ADDRESS dest__len);
+import void Strings_Insert (CHAR *source, ADDRESS source__len, INT16 pos, CHAR *dest, ADDRESS dest__len);
+import INT16 Strings_Length (CHAR *s, ADDRESS s__len);
+import BOOLEAN Strings_Match (CHAR *string, ADDRESS string__len, CHAR *pattern, ADDRESS pattern__len);
+import INT16 Strings_Pos (CHAR *pattern, ADDRESS pattern__len, CHAR *s, ADDRESS s__len, INT16 pos);
+import void Strings_Replace (CHAR *source, ADDRESS source__len, INT16 pos, CHAR *dest, ADDRESS dest__len);
 import void *Strings__init(void);
 
 
diff --git a/bootstrap/windows-48/Texts.c b/bootstrap/windows-48/Texts.c
index ad26b1cb..1428c051 100644
--- a/bootstrap/windows-48/Texts.c
+++ b/bootstrap/windows-48/Texts.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
@@ -187,20 +187,20 @@ export void Texts_Append (Texts_Text T, Texts_Buffer B);
 export void Texts_ChangeLooks (Texts_Text T, INT32 beg, INT32 end, UINT32 sel, Texts_FontsFont fnt, INT8 col, INT8 voff);
 static Texts_Elem Texts_CloneElem (Texts_Elem e);
 static Texts_Piece Texts_ClonePiece (Texts_Piece p);
-export void Texts_Close (Texts_Text T, CHAR *name, LONGINT name__len);
+export void Texts_Close (Texts_Text T, CHAR *name, ADDRESS name__len);
 export void Texts_Copy (Texts_Buffer SB, Texts_Buffer DB);
 export void Texts_CopyElem (Texts_Elem SE, Texts_Elem DE);
 export void Texts_Delete (Texts_Text T, INT32 beg, INT32 end);
 export Texts_Text Texts_ElemBase (Texts_Elem E);
 export INT32 Texts_ElemPos (Texts_Elem E);
 static void Texts_Find (Texts_Text T, INT32 *pos, Texts_Run *u, INT32 *org, INT32 *off);
-static Texts_FontsFont Texts_FontsThis (CHAR *name, LONGINT name__len);
+static Texts_FontsFont Texts_FontsThis (CHAR *name, ADDRESS name__len);
 static void Texts_HandleAlien (Texts_Elem E, Texts_ElemMsg *msg, ADDRESS *msg__typ);
 export void Texts_Insert (Texts_Text T, INT32 pos, Texts_Buffer B);
 export void Texts_Load (Files_Rider *r, ADDRESS *r__typ, Texts_Text T);
 static void Texts_Load0 (Files_Rider *r, ADDRESS *r__typ, Texts_Text T);
 static void Texts_Merge (Texts_Text T, Texts_Run u, Texts_Run *v);
-export void Texts_Open (Texts_Text T, CHAR *name, LONGINT name__len);
+export void Texts_Open (Texts_Text T, CHAR *name, ADDRESS name__len);
 export void Texts_OpenBuf (Texts_Buffer B);
 export void Texts_OpenReader (Texts_Reader *R, ADDRESS *R__typ, Texts_Text T, INT32 pos);
 export void Texts_OpenScanner (Texts_Scanner *S, ADDRESS *S__typ, Texts_Text T, INT32 pos);
@@ -229,10 +229,10 @@ export void Texts_WriteLongRealHex (Texts_Writer *W, ADDRESS *W__typ, LONGREAL x
 export void Texts_WriteReal (Texts_Writer *W, ADDRESS *W__typ, REAL x, INT16 n);
 export void Texts_WriteRealFix (Texts_Writer *W, ADDRESS *W__typ, REAL x, INT16 n, INT16 k);
 export void Texts_WriteRealHex (Texts_Writer *W, ADDRESS *W__typ, REAL x);
-export void Texts_WriteString (Texts_Writer *W, ADDRESS *W__typ, CHAR *s, LONGINT s__len);
+export void Texts_WriteString (Texts_Writer *W, ADDRESS *W__typ, CHAR *s, ADDRESS s__len);
 
 
-static Texts_FontsFont Texts_FontsThis (CHAR *name, LONGINT name__len)
+static Texts_FontsFont Texts_FontsThis (CHAR *name, ADDRESS name__len)
 {
 	Texts_FontsFont F = NIL;
 	__NEW(F, Texts_FontDesc);
@@ -1027,7 +1027,7 @@ void Texts_WriteLn (Texts_Writer *W, ADDRESS *W__typ)
 	Texts_Write(&*W, W__typ, 0x0d);
 }
 
-void Texts_WriteString (Texts_Writer *W, ADDRESS *W__typ, CHAR *s, LONGINT s__len)
+void Texts_WriteString (Texts_Writer *W, ADDRESS *W__typ, CHAR *s, ADDRESS s__len)
 {
 	INT16 i;
 	__DUP(s, s__len, CHAR);
@@ -1539,7 +1539,7 @@ void Texts_Load (Files_Rider *r, ADDRESS *r__typ, Texts_Text T)
 	Texts_Load0(&*r, r__typ, T);
 }
 
-void Texts_Open (Texts_Text T, CHAR *name, LONGINT name__len)
+void Texts_Open (Texts_Text T, CHAR *name, ADDRESS name__len)
 {
 	Files_File f = NIL;
 	Files_Rider r;
@@ -1755,7 +1755,7 @@ void Texts_Store (Files_Rider *r, ADDRESS *r__typ, Texts_Text T)
 	Store__39_s = _s.lnk;
 }
 
-void Texts_Close (Texts_Text T, CHAR *name, LONGINT name__len)
+void Texts_Close (Texts_Text T, CHAR *name, ADDRESS name__len)
 {
 	Files_File f = NIL;
 	Files_Rider r;
diff --git a/bootstrap/windows-48/Texts.h b/bootstrap/windows-48/Texts.h
index e2c03958..fa28aa92 100644
--- a/bootstrap/windows-48/Texts.h
+++ b/bootstrap/windows-48/Texts.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef Texts__h
 #define Texts__h
@@ -131,7 +131,7 @@ import ADDRESS *Texts_Writer__typ;
 
 import void Texts_Append (Texts_Text T, Texts_Buffer B);
 import void Texts_ChangeLooks (Texts_Text T, INT32 beg, INT32 end, UINT32 sel, Texts_FontsFont fnt, INT8 col, INT8 voff);
-import void Texts_Close (Texts_Text T, CHAR *name, LONGINT name__len);
+import void Texts_Close (Texts_Text T, CHAR *name, ADDRESS name__len);
 import void Texts_Copy (Texts_Buffer SB, Texts_Buffer DB);
 import void Texts_CopyElem (Texts_Elem SE, Texts_Elem DE);
 import void Texts_Delete (Texts_Text T, INT32 beg, INT32 end);
@@ -139,7 +139,7 @@ import Texts_Text Texts_ElemBase (Texts_Elem E);
 import INT32 Texts_ElemPos (Texts_Elem E);
 import void Texts_Insert (Texts_Text T, INT32 pos, Texts_Buffer B);
 import void Texts_Load (Files_Rider *r, ADDRESS *r__typ, Texts_Text T);
-import void Texts_Open (Texts_Text T, CHAR *name, LONGINT name__len);
+import void Texts_Open (Texts_Text T, CHAR *name, ADDRESS name__len);
 import void Texts_OpenBuf (Texts_Buffer B);
 import void Texts_OpenReader (Texts_Reader *R, ADDRESS *R__typ, Texts_Text T, INT32 pos);
 import void Texts_OpenScanner (Texts_Scanner *S, ADDRESS *S__typ, Texts_Text T, INT32 pos);
@@ -166,7 +166,7 @@ import void Texts_WriteLongRealHex (Texts_Writer *W, ADDRESS *W__typ, LONGREAL x
 import void Texts_WriteReal (Texts_Writer *W, ADDRESS *W__typ, REAL x, INT16 n);
 import void Texts_WriteRealFix (Texts_Writer *W, ADDRESS *W__typ, REAL x, INT16 n, INT16 k);
 import void Texts_WriteRealHex (Texts_Writer *W, ADDRESS *W__typ, REAL x);
-import void Texts_WriteString (Texts_Writer *W, ADDRESS *W__typ, CHAR *s, LONGINT s__len);
+import void Texts_WriteString (Texts_Writer *W, ADDRESS *W__typ, CHAR *s, ADDRESS s__len);
 import void *Texts__init(void);
 
 
diff --git a/bootstrap/windows-48/VT100.c b/bootstrap/windows-48/VT100.c
index f69fd90e..38c0743f 100644
--- a/bootstrap/windows-48/VT100.c
+++ b/bootstrap/windows-48/VT100.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
@@ -27,23 +27,23 @@ export void VT100_DECTCEMl (void);
 export void VT100_DSR (INT16 n);
 export void VT100_ED (INT16 n);
 export void VT100_EL (INT16 n);
-static void VT100_EscSeq (INT16 n, CHAR *letter, LONGINT letter__len);
-static void VT100_EscSeq0 (CHAR *letter, LONGINT letter__len);
-static void VT100_EscSeq2 (INT16 n, INT16 m, CHAR *letter, LONGINT letter__len);
-static void VT100_EscSeqSwapped (INT16 n, CHAR *letter, LONGINT letter__len);
+static void VT100_EscSeq (INT16 n, CHAR *letter, ADDRESS letter__len);
+static void VT100_EscSeq0 (CHAR *letter, ADDRESS letter__len);
+static void VT100_EscSeq2 (INT16 n, INT16 m, CHAR *letter, ADDRESS letter__len);
+static void VT100_EscSeqSwapped (INT16 n, CHAR *letter, ADDRESS letter__len);
 export void VT100_HVP (INT16 n, INT16 m);
-export void VT100_IntToStr (INT32 int_, CHAR *str, LONGINT str__len);
+export void VT100_IntToStr (INT32 int_, CHAR *str, ADDRESS str__len);
 export void VT100_RCP (void);
-static void VT100_Reverse0 (CHAR *str, LONGINT str__len, INT16 start, INT16 end);
+static void VT100_Reverse0 (CHAR *str, ADDRESS str__len, INT16 start, INT16 end);
 export void VT100_SCP (void);
 export void VT100_SD (INT16 n);
 export void VT100_SGR (INT16 n);
 export void VT100_SGR2 (INT16 n, INT16 m);
 export void VT100_SU (INT16 n);
-export void VT100_SetAttr (CHAR *attr, LONGINT attr__len);
+export void VT100_SetAttr (CHAR *attr, ADDRESS attr__len);
 
 
-static void VT100_Reverse0 (CHAR *str, LONGINT str__len, INT16 start, INT16 end)
+static void VT100_Reverse0 (CHAR *str, ADDRESS str__len, INT16 start, INT16 end)
 {
 	CHAR h;
 	while (start < end) {
@@ -55,7 +55,7 @@ static void VT100_Reverse0 (CHAR *str, LONGINT str__len, INT16 start, INT16 end)
 	}
 }
 
-void VT100_IntToStr (INT32 int_, CHAR *str, LONGINT str__len)
+void VT100_IntToStr (INT32 int_, CHAR *str, ADDRESS str__len)
 {
 	CHAR b[21];
 	INT16 s, e;
@@ -84,7 +84,7 @@ void VT100_IntToStr (INT32 int_, CHAR *str, LONGINT str__len)
 	__COPY(b, str, str__len);
 }
 
-static void VT100_EscSeq0 (CHAR *letter, LONGINT letter__len)
+static void VT100_EscSeq0 (CHAR *letter, ADDRESS letter__len)
 {
 	CHAR cmd[9];
 	__DUP(letter, letter__len, CHAR);
@@ -94,7 +94,7 @@ static void VT100_EscSeq0 (CHAR *letter, LONGINT letter__len)
 	__DEL(letter);
 }
 
-static void VT100_EscSeq (INT16 n, CHAR *letter, LONGINT letter__len)
+static void VT100_EscSeq (INT16 n, CHAR *letter, ADDRESS letter__len)
 {
 	CHAR nstr[2];
 	CHAR cmd[7];
@@ -107,7 +107,7 @@ static void VT100_EscSeq (INT16 n, CHAR *letter, LONGINT letter__len)
 	__DEL(letter);
 }
 
-static void VT100_EscSeqSwapped (INT16 n, CHAR *letter, LONGINT letter__len)
+static void VT100_EscSeqSwapped (INT16 n, CHAR *letter, ADDRESS letter__len)
 {
 	CHAR nstr[2];
 	CHAR cmd[7];
@@ -120,7 +120,7 @@ static void VT100_EscSeqSwapped (INT16 n, CHAR *letter, LONGINT letter__len)
 	__DEL(letter);
 }
 
-static void VT100_EscSeq2 (INT16 n, INT16 m, CHAR *letter, LONGINT letter__len)
+static void VT100_EscSeq2 (INT16 n, INT16 m, CHAR *letter, ADDRESS letter__len)
 {
 	CHAR nstr[5], mstr[5];
 	CHAR cmd[12];
@@ -236,7 +236,7 @@ void VT100_DECTCEMh (void)
 	VT100_EscSeq0((CHAR*)"\?25h", 5);
 }
 
-void VT100_SetAttr (CHAR *attr, LONGINT attr__len)
+void VT100_SetAttr (CHAR *attr, ADDRESS attr__len)
 {
 	CHAR tmpstr[16];
 	__DUP(attr, attr__len, CHAR);
diff --git a/bootstrap/windows-48/VT100.h b/bootstrap/windows-48/VT100.h
index d99406ec..4bbb3110 100644
--- a/bootstrap/windows-48/VT100.h
+++ b/bootstrap/windows-48/VT100.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef VT100__h
 #define VT100__h
@@ -23,14 +23,14 @@ import void VT100_DSR (INT16 n);
 import void VT100_ED (INT16 n);
 import void VT100_EL (INT16 n);
 import void VT100_HVP (INT16 n, INT16 m);
-import void VT100_IntToStr (INT32 int_, CHAR *str, LONGINT str__len);
+import void VT100_IntToStr (INT32 int_, CHAR *str, ADDRESS str__len);
 import void VT100_RCP (void);
 import void VT100_SCP (void);
 import void VT100_SD (INT16 n);
 import void VT100_SGR (INT16 n);
 import void VT100_SGR2 (INT16 n, INT16 m);
 import void VT100_SU (INT16 n);
-import void VT100_SetAttr (CHAR *attr, LONGINT attr__len);
+import void VT100_SetAttr (CHAR *attr, ADDRESS attr__len);
 import void *VT100__init(void);
 
 
diff --git a/bootstrap/windows-48/extTools.c b/bootstrap/windows-48/extTools.c
index 37630d23..66f80319 100644
--- a/bootstrap/windows-48/extTools.c
+++ b/bootstrap/windows-48/extTools.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
@@ -17,13 +17,13 @@
 static CHAR extTools_CFLAGS[1023];
 
 
-export void extTools_Assemble (CHAR *moduleName, LONGINT moduleName__len);
-static void extTools_InitialiseCompilerCommand (CHAR *s, LONGINT s__len);
-export void extTools_LinkMain (CHAR *moduleName, LONGINT moduleName__len, BOOLEAN statically, CHAR *additionalopts, LONGINT additionalopts__len);
-static void extTools_execute (CHAR *title, LONGINT title__len, CHAR *cmd, LONGINT cmd__len);
+export void extTools_Assemble (CHAR *moduleName, ADDRESS moduleName__len);
+static void extTools_InitialiseCompilerCommand (CHAR *s, ADDRESS s__len);
+export void extTools_LinkMain (CHAR *moduleName, ADDRESS moduleName__len, BOOLEAN statically, CHAR *additionalopts, ADDRESS additionalopts__len);
+static void extTools_execute (CHAR *title, ADDRESS title__len, CHAR *cmd, ADDRESS cmd__len);
 
 
-static void extTools_execute (CHAR *title, LONGINT title__len, CHAR *cmd, LONGINT cmd__len)
+static void extTools_execute (CHAR *title, ADDRESS title__len, CHAR *cmd, ADDRESS cmd__len)
 {
 	INT16 r, status, exitcode;
 	__DUP(title, title__len, CHAR);
@@ -63,7 +63,7 @@ static void extTools_execute (CHAR *title, LONGINT title__len, CHAR *cmd, LONGIN
 	__DEL(cmd);
 }
 
-static void extTools_InitialiseCompilerCommand (CHAR *s, LONGINT s__len)
+static void extTools_InitialiseCompilerCommand (CHAR *s, ADDRESS s__len)
 {
 	__COPY("gcc -g", s, s__len);
 	Strings_Append((CHAR*)" -I \"", 6, (void*)s, s__len);
@@ -74,7 +74,7 @@ static void extTools_InitialiseCompilerCommand (CHAR *s, LONGINT s__len)
 	Strings_Append((CHAR*)" ", 2, (void*)s, s__len);
 }
 
-void extTools_Assemble (CHAR *moduleName, LONGINT moduleName__len)
+void extTools_Assemble (CHAR *moduleName, ADDRESS moduleName__len)
 {
 	CHAR cmd[1023];
 	__DUP(moduleName, moduleName__len, CHAR);
@@ -86,7 +86,7 @@ void extTools_Assemble (CHAR *moduleName, LONGINT moduleName__len)
 	__DEL(moduleName);
 }
 
-void extTools_LinkMain (CHAR *moduleName, LONGINT moduleName__len, BOOLEAN statically, CHAR *additionalopts, LONGINT additionalopts__len)
+void extTools_LinkMain (CHAR *moduleName, ADDRESS moduleName__len, BOOLEAN statically, CHAR *additionalopts, ADDRESS additionalopts__len)
 {
 	CHAR cmd[1023];
 	__DUP(additionalopts, additionalopts__len, CHAR);
diff --git a/bootstrap/windows-48/extTools.h b/bootstrap/windows-48/extTools.h
index 63e5df15..472c60f3 100644
--- a/bootstrap/windows-48/extTools.h
+++ b/bootstrap/windows-48/extTools.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef extTools__h
 #define extTools__h
@@ -8,8 +8,8 @@
 
 
 
-import void extTools_Assemble (CHAR *moduleName, LONGINT moduleName__len);
-import void extTools_LinkMain (CHAR *moduleName, LONGINT moduleName__len, BOOLEAN statically, CHAR *additionalopts, LONGINT additionalopts__len);
+import void extTools_Assemble (CHAR *moduleName, ADDRESS moduleName__len);
+import void extTools_LinkMain (CHAR *moduleName, ADDRESS moduleName__len, BOOLEAN statically, CHAR *additionalopts, ADDRESS additionalopts__len);
 import void *extTools__init(void);
 
 
diff --git a/bootstrap/windows-88/Compiler.c b/bootstrap/windows-88/Compiler.c
index dc4bb660..e900905f 100644
--- a/bootstrap/windows-88/Compiler.c
+++ b/bootstrap/windows-88/Compiler.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. xtspamS */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. xtspamS */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/windows-88/Configuration.c b/bootstrap/windows-88/Configuration.c
index 2d0061df..071d7b8e 100644
--- a/bootstrap/windows-88/Configuration.c
+++ b/bootstrap/windows-88/Configuration.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
@@ -19,6 +19,6 @@ export void *Configuration__init(void)
 	__DEFMOD;
 	__REGMOD("Configuration", 0);
 /* BEGIN */
-	__MOVE("1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8.", Configuration_versionLong, 75);
+	__MOVE("2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8.", Configuration_versionLong, 75);
 	__ENDMOD;
 }
diff --git a/bootstrap/windows-88/Configuration.h b/bootstrap/windows-88/Configuration.h
index b28e0caa..b1942442 100644
--- a/bootstrap/windows-88/Configuration.h
+++ b/bootstrap/windows-88/Configuration.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef Configuration__h
 #define Configuration__h
diff --git a/bootstrap/windows-88/Files.c b/bootstrap/windows-88/Files.c
index c3ea44cf..fce3936a 100644
--- a/bootstrap/windows-88/Files.c
+++ b/bootstrap/windows-88/Files.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. tspaSF */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. tspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
@@ -53,7 +53,7 @@ static Files_File Files_files;
 static INT16 Files_tempno;
 static CHAR Files_HOME[1024];
 static struct {
-	LONGINT len[1];
+	ADDRESS len[1];
 	CHAR data[1];
 } *Files_SearchPath;
 
@@ -63,56 +63,56 @@ export ADDRESS *Files_Rider__typ;
 
 export Files_File Files_Base (Files_Rider *r, ADDRESS *r__typ);
 static Files_File Files_CacheEntry (Platform_FileIdentity identity);
-export void Files_ChangeDirectory (CHAR *path, LONGINT path__len, INT16 *res);
+export void Files_ChangeDirectory (CHAR *path, ADDRESS path__len, INT16 *res);
 export void Files_Close (Files_File f);
 static void Files_CloseOSFile (Files_File f);
 static void Files_Create (Files_File f);
-export void Files_Delete (CHAR *name, LONGINT name__len, INT16 *res);
-static void Files_Err (CHAR *s, LONGINT s__len, Files_File f, INT16 errcode);
+export void Files_Delete (CHAR *name, ADDRESS name__len, INT16 *res);
+static void Files_Err (CHAR *s, ADDRESS s__len, Files_File f, INT16 errcode);
 static void Files_Finalize (SYSTEM_PTR o);
-static void Files_FlipBytes (SYSTEM_BYTE *src, LONGINT src__len, SYSTEM_BYTE *dest, LONGINT dest__len);
+static void Files_FlipBytes (SYSTEM_BYTE *src, ADDRESS src__len, SYSTEM_BYTE *dest, ADDRESS dest__len);
 static void Files_Flush (Files_Buffer buf);
 export void Files_GetDate (Files_File f, INT32 *t, INT32 *d);
-export void Files_GetName (Files_File f, CHAR *name, LONGINT name__len);
-static void Files_GetTempName (CHAR *finalName, LONGINT finalName__len, CHAR *name, LONGINT name__len);
-static BOOLEAN Files_HasDir (CHAR *name, LONGINT name__len);
+export void Files_GetName (Files_File f, CHAR *name, ADDRESS name__len);
+static void Files_GetTempName (CHAR *finalName, ADDRESS finalName__len, CHAR *name, ADDRESS name__len);
+static BOOLEAN Files_HasDir (CHAR *name, ADDRESS name__len);
 export INT32 Files_Length (Files_File f);
-static void Files_MakeFileName (CHAR *dir, LONGINT dir__len, CHAR *name, LONGINT name__len, CHAR *dest, LONGINT dest__len);
-export Files_File Files_New (CHAR *name, LONGINT name__len);
-export Files_File Files_Old (CHAR *name, LONGINT name__len);
+static void Files_MakeFileName (CHAR *dir, ADDRESS dir__len, CHAR *name, ADDRESS name__len, CHAR *dest, ADDRESS dest__len);
+export Files_File Files_New (CHAR *name, ADDRESS name__len);
+export Files_File Files_Old (CHAR *name, ADDRESS name__len);
 export INT32 Files_Pos (Files_Rider *r, ADDRESS *r__typ);
 export void Files_Purge (Files_File f);
 export void Files_Read (Files_Rider *r, ADDRESS *r__typ, SYSTEM_BYTE *x);
 export void Files_ReadBool (Files_Rider *R, ADDRESS *R__typ, BOOLEAN *x);
-export void Files_ReadBytes (Files_Rider *r, ADDRESS *r__typ, SYSTEM_BYTE *x, LONGINT x__len, INT32 n);
+export void Files_ReadBytes (Files_Rider *r, ADDRESS *r__typ, SYSTEM_BYTE *x, ADDRESS x__len, INT32 n);
 export void Files_ReadInt (Files_Rider *R, ADDRESS *R__typ, INT16 *x);
 export void Files_ReadLInt (Files_Rider *R, ADDRESS *R__typ, INT32 *x);
 export void Files_ReadLReal (Files_Rider *R, ADDRESS *R__typ, LONGREAL *x);
-export void Files_ReadLine (Files_Rider *R, ADDRESS *R__typ, CHAR *x, LONGINT x__len);
-export void Files_ReadNum (Files_Rider *R, ADDRESS *R__typ, SYSTEM_BYTE *x, LONGINT x__len);
+export void Files_ReadLine (Files_Rider *R, ADDRESS *R__typ, CHAR *x, ADDRESS x__len);
+export void Files_ReadNum (Files_Rider *R, ADDRESS *R__typ, SYSTEM_BYTE *x, ADDRESS x__len);
 export void Files_ReadReal (Files_Rider *R, ADDRESS *R__typ, REAL *x);
 export void Files_ReadSet (Files_Rider *R, ADDRESS *R__typ, UINT32 *x);
-export void Files_ReadString (Files_Rider *R, ADDRESS *R__typ, CHAR *x, LONGINT x__len);
+export void Files_ReadString (Files_Rider *R, ADDRESS *R__typ, CHAR *x, ADDRESS x__len);
 export void Files_Register (Files_File f);
-export void Files_Rename (CHAR *old, LONGINT old__len, CHAR *new, LONGINT new__len, INT16 *res);
-static void Files_ScanPath (INT16 *pos, CHAR *dir, LONGINT dir__len);
+export void Files_Rename (CHAR *old, ADDRESS old__len, CHAR *new, ADDRESS new__len, INT16 *res);
+static void Files_ScanPath (INT16 *pos, CHAR *dir, ADDRESS dir__len);
 export void Files_Set (Files_Rider *r, ADDRESS *r__typ, Files_File f, INT32 pos);
-export void Files_SetSearchPath (CHAR *path, LONGINT path__len);
+export void Files_SetSearchPath (CHAR *path, ADDRESS path__len);
 export void Files_Write (Files_Rider *r, ADDRESS *r__typ, SYSTEM_BYTE x);
 export void Files_WriteBool (Files_Rider *R, ADDRESS *R__typ, BOOLEAN x);
-export void Files_WriteBytes (Files_Rider *r, ADDRESS *r__typ, SYSTEM_BYTE *x, LONGINT x__len, INT32 n);
+export void Files_WriteBytes (Files_Rider *r, ADDRESS *r__typ, SYSTEM_BYTE *x, ADDRESS x__len, INT32 n);
 export void Files_WriteInt (Files_Rider *R, ADDRESS *R__typ, INT16 x);
 export void Files_WriteLInt (Files_Rider *R, ADDRESS *R__typ, INT32 x);
 export void Files_WriteLReal (Files_Rider *R, ADDRESS *R__typ, LONGREAL x);
 export void Files_WriteNum (Files_Rider *R, ADDRESS *R__typ, INT64 x);
 export void Files_WriteReal (Files_Rider *R, ADDRESS *R__typ, REAL x);
 export void Files_WriteSet (Files_Rider *R, ADDRESS *R__typ, UINT32 x);
-export void Files_WriteString (Files_Rider *R, ADDRESS *R__typ, CHAR *x, LONGINT x__len);
+export void Files_WriteString (Files_Rider *R, ADDRESS *R__typ, CHAR *x, ADDRESS x__len);
 
 #define Files_IdxTrap()	__HALT(-1)
 #define Files_ToAdr(x)	(ADDRESS)x
 
-static void Files_Err (CHAR *s, LONGINT s__len, Files_File f, INT16 errcode)
+static void Files_Err (CHAR *s, ADDRESS s__len, Files_File f, INT16 errcode)
 {
 	__DUP(s, s__len, CHAR);
 	Out_Ln();
@@ -139,7 +139,7 @@ static void Files_Err (CHAR *s, LONGINT s__len, Files_File f, INT16 errcode)
 	__DEL(s);
 }
 
-static void Files_MakeFileName (CHAR *dir, LONGINT dir__len, CHAR *name, LONGINT name__len, CHAR *dest, LONGINT dest__len)
+static void Files_MakeFileName (CHAR *dir, ADDRESS dir__len, CHAR *name, ADDRESS name__len, CHAR *dest, ADDRESS dest__len)
 {
 	INT16 i, j;
 	__DUP(dir, dir__len, CHAR);
@@ -164,7 +164,7 @@ static void Files_MakeFileName (CHAR *dir, LONGINT dir__len, CHAR *name, LONGINT
 	__DEL(name);
 }
 
-static void Files_GetTempName (CHAR *finalName, LONGINT finalName__len, CHAR *name, LONGINT name__len)
+static void Files_GetTempName (CHAR *finalName, ADDRESS finalName__len, CHAR *name, ADDRESS name__len)
 {
 	INT32 n, i, j;
 	__DUP(finalName, finalName__len, CHAR);
@@ -317,7 +317,7 @@ INT32 Files_Length (Files_File f)
 	return f->len;
 }
 
-Files_File Files_New (CHAR *name, LONGINT name__len)
+Files_File Files_New (CHAR *name, ADDRESS name__len)
 {
 	Files_File f = NIL;
 	__DUP(name, name__len, CHAR);
@@ -333,7 +333,7 @@ Files_File Files_New (CHAR *name, LONGINT name__len)
 	return f;
 }
 
-static void Files_ScanPath (INT16 *pos, CHAR *dir, LONGINT dir__len)
+static void Files_ScanPath (INT16 *pos, CHAR *dir, ADDRESS dir__len)
 {
 	INT16 i;
 	CHAR ch;
@@ -376,7 +376,7 @@ static void Files_ScanPath (INT16 *pos, CHAR *dir, LONGINT dir__len)
 	dir[i] = 0x00;
 }
 
-static BOOLEAN Files_HasDir (CHAR *name, LONGINT name__len)
+static BOOLEAN Files_HasDir (CHAR *name, ADDRESS name__len)
 {
 	INT16 i;
 	CHAR ch;
@@ -416,7 +416,7 @@ static Files_File Files_CacheEntry (Platform_FileIdentity identity)
 	return NIL;
 }
 
-Files_File Files_Old (CHAR *name, LONGINT name__len)
+Files_File Files_Old (CHAR *name, ADDRESS name__len)
 {
 	Files_File f = NIL;
 	INT64 fd;
@@ -619,7 +619,7 @@ void Files_Read (Files_Rider *r, ADDRESS *r__typ, SYSTEM_BYTE *x)
 	}
 }
 
-void Files_ReadBytes (Files_Rider *r, ADDRESS *r__typ, SYSTEM_BYTE *x, LONGINT x__len, INT32 n)
+void Files_ReadBytes (Files_Rider *r, ADDRESS *r__typ, SYSTEM_BYTE *x, ADDRESS x__len, INT32 n)
 {
 	INT32 xpos, min, restInBuf, offset;
 	Files_Buffer buf = NIL;
@@ -684,7 +684,7 @@ void Files_Write (Files_Rider *r, ADDRESS *r__typ, SYSTEM_BYTE x)
 	(*r).res = 0;
 }
 
-void Files_WriteBytes (Files_Rider *r, ADDRESS *r__typ, SYSTEM_BYTE *x, LONGINT x__len, INT32 n)
+void Files_WriteBytes (Files_Rider *r, ADDRESS *r__typ, SYSTEM_BYTE *x, ADDRESS x__len, INT32 n)
 {
 	INT32 xpos, min, restInBuf, offset;
 	Files_Buffer buf = NIL;
@@ -723,14 +723,14 @@ void Files_WriteBytes (Files_Rider *r, ADDRESS *r__typ, SYSTEM_BYTE *x, LONGINT
 	(*r).res = 0;
 }
 
-void Files_Delete (CHAR *name, LONGINT name__len, INT16 *res)
+void Files_Delete (CHAR *name, ADDRESS name__len, INT16 *res)
 {
 	__DUP(name, name__len, CHAR);
 	*res = Platform_Unlink((void*)name, name__len);
 	__DEL(name);
 }
 
-void Files_Rename (CHAR *old, LONGINT old__len, CHAR *new, LONGINT new__len, INT16 *res)
+void Files_Rename (CHAR *old, ADDRESS old__len, CHAR *new, ADDRESS new__len, INT16 *res)
 {
 	INT64 fdold, fdnew;
 	INT32 n;
@@ -814,14 +814,14 @@ void Files_Register (Files_File f)
 	}
 }
 
-void Files_ChangeDirectory (CHAR *path, LONGINT path__len, INT16 *res)
+void Files_ChangeDirectory (CHAR *path, ADDRESS path__len, INT16 *res)
 {
 	__DUP(path, path__len, CHAR);
 	*res = Platform_Chdir((void*)path, path__len);
 	__DEL(path);
 }
 
-static void Files_FlipBytes (SYSTEM_BYTE *src, LONGINT src__len, SYSTEM_BYTE *dest, LONGINT dest__len)
+static void Files_FlipBytes (SYSTEM_BYTE *src, ADDRESS src__len, SYSTEM_BYTE *dest, ADDRESS dest__len)
 {
 	INT32 i, j;
 	if (!Platform_LittleEndian) {
@@ -879,7 +879,7 @@ void Files_ReadLReal (Files_Rider *R, ADDRESS *R__typ, LONGREAL *x)
 	Files_FlipBytes((void*)b, 8, (void*)&*x, 8);
 }
 
-void Files_ReadString (Files_Rider *R, ADDRESS *R__typ, CHAR *x, LONGINT x__len)
+void Files_ReadString (Files_Rider *R, ADDRESS *R__typ, CHAR *x, ADDRESS x__len)
 {
 	INT16 i;
 	CHAR ch;
@@ -891,7 +891,7 @@ void Files_ReadString (Files_Rider *R, ADDRESS *R__typ, CHAR *x, LONGINT x__len)
 	} while (!(ch == 0x00));
 }
 
-void Files_ReadLine (Files_Rider *R, ADDRESS *R__typ, CHAR *x, LONGINT x__len)
+void Files_ReadLine (Files_Rider *R, ADDRESS *R__typ, CHAR *x, ADDRESS x__len)
 {
 	INT16 i;
 	i = 0;
@@ -908,7 +908,7 @@ void Files_ReadLine (Files_Rider *R, ADDRESS *R__typ, CHAR *x, LONGINT x__len)
 	x[i] = 0x00;
 }
 
-void Files_ReadNum (Files_Rider *R, ADDRESS *R__typ, SYSTEM_BYTE *x, LONGINT x__len)
+void Files_ReadNum (Files_Rider *R, ADDRESS *R__typ, SYSTEM_BYTE *x, ADDRESS x__len)
 {
 	INT8 s, b;
 	INT64 q;
@@ -974,7 +974,7 @@ void Files_WriteLReal (Files_Rider *R, ADDRESS *R__typ, LONGREAL x)
 	Files_WriteBytes(&*R, R__typ, (void*)b, 8, 8);
 }
 
-void Files_WriteString (Files_Rider *R, ADDRESS *R__typ, CHAR *x, LONGINT x__len)
+void Files_WriteString (Files_Rider *R, ADDRESS *R__typ, CHAR *x, ADDRESS x__len)
 {
 	INT16 i;
 	i = 0;
@@ -993,7 +993,7 @@ void Files_WriteNum (Files_Rider *R, ADDRESS *R__typ, INT64 x)
 	Files_Write(&*R, R__typ, (CHAR)__MASK(x, -128));
 }
 
-void Files_GetName (Files_File f, CHAR *name, LONGINT name__len)
+void Files_GetName (Files_File f, CHAR *name, ADDRESS name__len)
 {
 	__COPY(f->workName, name, name__len);
 }
@@ -1011,7 +1011,7 @@ static void Files_Finalize (SYSTEM_PTR o)
 	}
 }
 
-void Files_SetSearchPath (CHAR *path, LONGINT path__len)
+void Files_SetSearchPath (CHAR *path, ADDRESS path__len)
 {
 	__DUP(path, path__len, CHAR);
 	if (Strings_Length(path, path__len) != 0) {
diff --git a/bootstrap/windows-88/Files.h b/bootstrap/windows-88/Files.h
index 5c402312..7459e85e 100644
--- a/bootstrap/windows-88/Files.h
+++ b/bootstrap/windows-88/Files.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. tspaSF */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. tspaSF */
 
 #ifndef Files__h
 #define Files__h
@@ -29,41 +29,41 @@ import ADDRESS *Files_FileDesc__typ;
 import ADDRESS *Files_Rider__typ;
 
 import Files_File Files_Base (Files_Rider *r, ADDRESS *r__typ);
-import void Files_ChangeDirectory (CHAR *path, LONGINT path__len, INT16 *res);
+import void Files_ChangeDirectory (CHAR *path, ADDRESS path__len, INT16 *res);
 import void Files_Close (Files_File f);
-import void Files_Delete (CHAR *name, LONGINT name__len, INT16 *res);
+import void Files_Delete (CHAR *name, ADDRESS name__len, INT16 *res);
 import void Files_GetDate (Files_File f, INT32 *t, INT32 *d);
-import void Files_GetName (Files_File f, CHAR *name, LONGINT name__len);
+import void Files_GetName (Files_File f, CHAR *name, ADDRESS name__len);
 import INT32 Files_Length (Files_File f);
-import Files_File Files_New (CHAR *name, LONGINT name__len);
-import Files_File Files_Old (CHAR *name, LONGINT name__len);
+import Files_File Files_New (CHAR *name, ADDRESS name__len);
+import Files_File Files_Old (CHAR *name, ADDRESS name__len);
 import INT32 Files_Pos (Files_Rider *r, ADDRESS *r__typ);
 import void Files_Purge (Files_File f);
 import void Files_Read (Files_Rider *r, ADDRESS *r__typ, SYSTEM_BYTE *x);
 import void Files_ReadBool (Files_Rider *R, ADDRESS *R__typ, BOOLEAN *x);
-import void Files_ReadBytes (Files_Rider *r, ADDRESS *r__typ, SYSTEM_BYTE *x, LONGINT x__len, INT32 n);
+import void Files_ReadBytes (Files_Rider *r, ADDRESS *r__typ, SYSTEM_BYTE *x, ADDRESS x__len, INT32 n);
 import void Files_ReadInt (Files_Rider *R, ADDRESS *R__typ, INT16 *x);
 import void Files_ReadLInt (Files_Rider *R, ADDRESS *R__typ, INT32 *x);
 import void Files_ReadLReal (Files_Rider *R, ADDRESS *R__typ, LONGREAL *x);
-import void Files_ReadLine (Files_Rider *R, ADDRESS *R__typ, CHAR *x, LONGINT x__len);
-import void Files_ReadNum (Files_Rider *R, ADDRESS *R__typ, SYSTEM_BYTE *x, LONGINT x__len);
+import void Files_ReadLine (Files_Rider *R, ADDRESS *R__typ, CHAR *x, ADDRESS x__len);
+import void Files_ReadNum (Files_Rider *R, ADDRESS *R__typ, SYSTEM_BYTE *x, ADDRESS x__len);
 import void Files_ReadReal (Files_Rider *R, ADDRESS *R__typ, REAL *x);
 import void Files_ReadSet (Files_Rider *R, ADDRESS *R__typ, UINT32 *x);
-import void Files_ReadString (Files_Rider *R, ADDRESS *R__typ, CHAR *x, LONGINT x__len);
+import void Files_ReadString (Files_Rider *R, ADDRESS *R__typ, CHAR *x, ADDRESS x__len);
 import void Files_Register (Files_File f);
-import void Files_Rename (CHAR *old, LONGINT old__len, CHAR *new, LONGINT new__len, INT16 *res);
+import void Files_Rename (CHAR *old, ADDRESS old__len, CHAR *new, ADDRESS new__len, INT16 *res);
 import void Files_Set (Files_Rider *r, ADDRESS *r__typ, Files_File f, INT32 pos);
-import void Files_SetSearchPath (CHAR *path, LONGINT path__len);
+import void Files_SetSearchPath (CHAR *path, ADDRESS path__len);
 import void Files_Write (Files_Rider *r, ADDRESS *r__typ, SYSTEM_BYTE x);
 import void Files_WriteBool (Files_Rider *R, ADDRESS *R__typ, BOOLEAN x);
-import void Files_WriteBytes (Files_Rider *r, ADDRESS *r__typ, SYSTEM_BYTE *x, LONGINT x__len, INT32 n);
+import void Files_WriteBytes (Files_Rider *r, ADDRESS *r__typ, SYSTEM_BYTE *x, ADDRESS x__len, INT32 n);
 import void Files_WriteInt (Files_Rider *R, ADDRESS *R__typ, INT16 x);
 import void Files_WriteLInt (Files_Rider *R, ADDRESS *R__typ, INT32 x);
 import void Files_WriteLReal (Files_Rider *R, ADDRESS *R__typ, LONGREAL x);
 import void Files_WriteNum (Files_Rider *R, ADDRESS *R__typ, INT64 x);
 import void Files_WriteReal (Files_Rider *R, ADDRESS *R__typ, REAL x);
 import void Files_WriteSet (Files_Rider *R, ADDRESS *R__typ, UINT32 x);
-import void Files_WriteString (Files_Rider *R, ADDRESS *R__typ, CHAR *x, LONGINT x__len);
+import void Files_WriteString (Files_Rider *R, ADDRESS *R__typ, CHAR *x, ADDRESS x__len);
 import void *Files__init(void);
 
 
diff --git a/bootstrap/windows-88/Heap.c b/bootstrap/windows-88/Heap.c
index a2bb8f2f..032e9544 100644
--- a/bootstrap/windows-88/Heap.c
+++ b/bootstrap/windows-88/Heap.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. tsSF */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. tsSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
@@ -85,14 +85,14 @@ static void Heap_ExtendHeap (INT64 blksz);
 export void Heap_FINALL (void);
 static void Heap_Finalize (void);
 export void Heap_GC (BOOLEAN markStack);
-static void Heap_HeapSort (INT64 n, INT64 *a, LONGINT a__len);
+static void Heap_HeapSort (INT64 n, INT64 *a, ADDRESS a__len);
 export void Heap_INCREF (Heap_Module m);
 export void Heap_InitHeap (void);
 export void Heap_Lock (void);
 static void Heap_Mark (INT64 q);
-static void Heap_MarkCandidates (INT64 n, INT64 *cand, LONGINT cand__len);
+static void Heap_MarkCandidates (INT64 n, INT64 *cand, ADDRESS cand__len);
 static void Heap_MarkP (SYSTEM_PTR p);
-static void Heap_MarkStack (INT64 n, INT64 *cand, LONGINT cand__len);
+static void Heap_MarkStack (INT64 n, INT64 *cand, ADDRESS cand__len);
 export SYSTEM_PTR Heap_NEWBLK (INT64 size);
 export SYSTEM_PTR Heap_NEWREC (INT64 tag);
 static INT64 Heap_NewChunk (INT64 blksz);
@@ -101,7 +101,7 @@ export SYSTEM_PTR Heap_REGMOD (Heap_ModuleName name, Heap_EnumProc enumPtrs);
 export void Heap_REGTYP (Heap_Module m, INT64 typ);
 export void Heap_RegisterFinalizer (SYSTEM_PTR obj, Heap_Finalizer finalize);
 static void Heap_Scan (void);
-static void Heap_Sift (INT64 l, INT64 r, INT64 *a, LONGINT a__len);
+static void Heap_Sift (INT64 l, INT64 r, INT64 *a, ADDRESS a__len);
 export void Heap_Unlock (void);
 
 extern void *Heap__init();
@@ -445,7 +445,7 @@ static void Heap_Scan (void)
 	}
 }
 
-static void Heap_Sift (INT64 l, INT64 r, INT64 *a, LONGINT a__len)
+static void Heap_Sift (INT64 l, INT64 r, INT64 *a, ADDRESS a__len)
 {
 	INT64 i, j, x;
 	j = l;
@@ -464,7 +464,7 @@ static void Heap_Sift (INT64 l, INT64 r, INT64 *a, LONGINT a__len)
 	a[i] = x;
 }
 
-static void Heap_HeapSort (INT64 n, INT64 *a, LONGINT a__len)
+static void Heap_HeapSort (INT64 n, INT64 *a, ADDRESS a__len)
 {
 	INT64 l, r, x;
 	l = __ASHR(n, 1);
@@ -482,7 +482,7 @@ static void Heap_HeapSort (INT64 n, INT64 *a, LONGINT a__len)
 	}
 }
 
-static void Heap_MarkCandidates (INT64 n, INT64 *cand, LONGINT cand__len)
+static void Heap_MarkCandidates (INT64 n, INT64 *cand, ADDRESS cand__len)
 {
 	INT64 chnk, adr, tag, next, lim, lim1, i, ptr, size;
 	chnk = Heap_heap;
@@ -571,7 +571,7 @@ void Heap_FINALL (void)
 	}
 }
 
-static void Heap_MarkStack (INT64 n, INT64 *cand, LONGINT cand__len)
+static void Heap_MarkStack (INT64 n, INT64 *cand, ADDRESS cand__len)
 {
 	SYSTEM_PTR frame;
 	INT64 inc, nofcand, sp, p, stack0;
diff --git a/bootstrap/windows-88/Heap.h b/bootstrap/windows-88/Heap.h
index 163cad8c..bf12c17b 100644
--- a/bootstrap/windows-88/Heap.h
+++ b/bootstrap/windows-88/Heap.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. tsSF */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. tsSF */
 
 #ifndef Heap__h
 #define Heap__h
diff --git a/bootstrap/windows-88/Modules.c b/bootstrap/windows-88/Modules.c
index 4e4d62e7..12ee85c4 100644
--- a/bootstrap/windows-88/Modules.c
+++ b/bootstrap/windows-88/Modules.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
@@ -47,21 +47,21 @@ export Modules_ModuleName Modules_imported, Modules_importing;
 export ADDRESS *Modules_ModuleDesc__typ;
 export ADDRESS *Modules_CmdDesc__typ;
 
-static void Modules_Append (CHAR *a, LONGINT a__len, CHAR *b, LONGINT b__len);
+static void Modules_Append (CHAR *a, ADDRESS a__len, CHAR *b, ADDRESS b__len);
 export void Modules_AssertFail (INT32 code);
 static void Modules_DisplayHaltCode (INT32 code);
-export void Modules_Free (CHAR *name, LONGINT name__len, BOOLEAN all);
+export void Modules_Free (CHAR *name, ADDRESS name__len, BOOLEAN all);
 export void Modules_Halt (INT32 code);
-export Modules_Command Modules_ThisCommand (Modules_Module mod, CHAR *name, LONGINT name__len);
-export Modules_Module Modules_ThisMod (CHAR *name, LONGINT name__len);
+export Modules_Command Modules_ThisCommand (Modules_Module mod, CHAR *name, ADDRESS name__len);
+export Modules_Module Modules_ThisMod (CHAR *name, ADDRESS name__len);
 static void Modules_errch (CHAR c);
 static void Modules_errint (INT32 l);
-static void Modules_errstring (CHAR *s, LONGINT s__len);
+static void Modules_errstring (CHAR *s, ADDRESS s__len);
 
 #define Modules_modules()	(Modules_Module)Heap_modules
 #define Modules_setmodules(m)	Heap_modules = m
 
-static void Modules_Append (CHAR *a, LONGINT a__len, CHAR *b, LONGINT b__len)
+static void Modules_Append (CHAR *a, ADDRESS a__len, CHAR *b, ADDRESS b__len)
 {
 	INT16 i, j;
 	__DUP(b, b__len, CHAR);
@@ -79,7 +79,7 @@ static void Modules_Append (CHAR *a, LONGINT a__len, CHAR *b, LONGINT b__len)
 	__DEL(b);
 }
 
-Modules_Module Modules_ThisMod (CHAR *name, LONGINT name__len)
+Modules_Module Modules_ThisMod (CHAR *name, ADDRESS name__len)
 {
 	Modules_Module m = NIL;
 	CHAR bodyname[64];
@@ -103,7 +103,7 @@ Modules_Module Modules_ThisMod (CHAR *name, LONGINT name__len)
 	return m;
 }
 
-Modules_Command Modules_ThisCommand (Modules_Module mod, CHAR *name, LONGINT name__len)
+Modules_Command Modules_ThisCommand (Modules_Module mod, CHAR *name, ADDRESS name__len)
 {
 	Modules_Cmd c = NIL;
 	__DUP(name, name__len, CHAR);
@@ -130,7 +130,7 @@ Modules_Command Modules_ThisCommand (Modules_Module mod, CHAR *name, LONGINT nam
 	__RETCHK;
 }
 
-void Modules_Free (CHAR *name, LONGINT name__len, BOOLEAN all)
+void Modules_Free (CHAR *name, ADDRESS name__len, BOOLEAN all)
 {
 	Modules_Module m = NIL, p = NIL;
 	__DUP(name, name__len, CHAR);
@@ -168,7 +168,7 @@ static void Modules_errch (CHAR c)
 	e = Platform_Write(1, (ADDRESS)&c, 1);
 }
 
-static void Modules_errstring (CHAR *s, LONGINT s__len)
+static void Modules_errstring (CHAR *s, ADDRESS s__len)
 {
 	INT32 i;
 	__DUP(s, s__len, CHAR);
diff --git a/bootstrap/windows-88/Modules.h b/bootstrap/windows-88/Modules.h
index 8bb89fe5..b1f2385e 100644
--- a/bootstrap/windows-88/Modules.h
+++ b/bootstrap/windows-88/Modules.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef Modules__h
 #define Modules__h
@@ -44,10 +44,10 @@ import ADDRESS *Modules_ModuleDesc__typ;
 import ADDRESS *Modules_CmdDesc__typ;
 
 import void Modules_AssertFail (INT32 code);
-import void Modules_Free (CHAR *name, LONGINT name__len, BOOLEAN all);
+import void Modules_Free (CHAR *name, ADDRESS name__len, BOOLEAN all);
 import void Modules_Halt (INT32 code);
-import Modules_Command Modules_ThisCommand (Modules_Module mod, CHAR *name, LONGINT name__len);
-import Modules_Module Modules_ThisMod (CHAR *name, LONGINT name__len);
+import Modules_Command Modules_ThisCommand (Modules_Module mod, CHAR *name, ADDRESS name__len);
+import Modules_Module Modules_ThisMod (CHAR *name, ADDRESS name__len);
 import void *Modules__init(void);
 
 
diff --git a/bootstrap/windows-88/OPB.c b/bootstrap/windows-88/OPB.c
index 3ef8e2f9..bc44b83a 100644
--- a/bootstrap/windows-88/OPB.c
+++ b/bootstrap/windows-88/OPB.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/windows-88/OPB.h b/bootstrap/windows-88/OPB.h
index 0be714e8..eb93787e 100644
--- a/bootstrap/windows-88/OPB.h
+++ b/bootstrap/windows-88/OPB.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef OPB__h
 #define OPB__h
diff --git a/bootstrap/windows-88/OPC.c b/bootstrap/windows-88/OPC.c
index ef4b429f..72e0feef 100644
--- a/bootstrap/windows-88/OPC.c
+++ b/bootstrap/windows-88/OPC.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
@@ -56,7 +56,7 @@ static void OPC_GenHeaderMsg (void);
 export void OPC_Halt (INT32 n);
 export void OPC_Ident (OPT_Object obj);
 static void OPC_IdentList (OPT_Object obj, INT16 vis);
-static void OPC_Include (CHAR *name, LONGINT name__len);
+static void OPC_Include (CHAR *name, ADDRESS name__len);
 static void OPC_IncludeImports (OPT_Object obj, INT16 vis);
 export void OPC_Increment (BOOLEAN decrement);
 export void OPC_Indent (INT16 count);
@@ -68,11 +68,11 @@ static void OPC_InitTProcs (OPT_Object typ, OPT_Object obj);
 export void OPC_IntLiteral (INT64 n, INT32 size);
 export void OPC_Len (OPT_Object obj, OPT_Struct array, INT64 dim);
 static void OPC_LenList (OPT_Object par, BOOLEAN ansiDefine, BOOLEAN showParamName);
-static INT16 OPC_Length (CHAR *s, LONGINT s__len);
+static INT16 OPC_Length (CHAR *s, ADDRESS s__len);
 export BOOLEAN OPC_NeedsRetval (OPT_Object proc);
 export INT32 OPC_NofPtrs (OPT_Struct typ);
-static INT16 OPC_PerfectHash (CHAR *s, LONGINT s__len);
-static BOOLEAN OPC_Prefixed (OPT_ConstExt x, CHAR *y, LONGINT y__len);
+static INT16 OPC_PerfectHash (CHAR *s, ADDRESS s__len);
+static BOOLEAN OPC_Prefixed (OPT_ConstExt x, CHAR *y, ADDRESS y__len);
 static void OPC_ProcHeader (OPT_Object proc, BOOLEAN define);
 static void OPC_ProcPredefs (OPT_Object obj, INT8 vis);
 static void OPC_PutBase (OPT_Struct typ);
@@ -80,8 +80,8 @@ static void OPC_PutPtrOffsets (OPT_Struct typ, INT32 adr, INT32 *cnt);
 static void OPC_RegCmds (OPT_Object obj);
 export void OPC_SetInclude (BOOLEAN exclude);
 static void OPC_Stars (OPT_Struct typ, BOOLEAN *openClause);
-static void OPC_Str1 (CHAR *s, LONGINT s__len, INT32 x);
-static void OPC_StringLiteral (CHAR *s, LONGINT s__len, INT32 l);
+static void OPC_Str1 (CHAR *s, ADDRESS s__len, INT32 x);
+static void OPC_StringLiteral (CHAR *s, ADDRESS s__len, INT32 l);
 export void OPC_TDescDecl (OPT_Struct typ);
 export void OPC_TypeDefs (OPT_Object obj, INT16 vis);
 export void OPC_TypeOf (OPT_Object ap);
@@ -137,7 +137,7 @@ void OPC_EndBlk0 (void)
 	OPM_Write('}');
 }
 
-static void OPC_Str1 (CHAR *s, LONGINT s__len, INT32 x)
+static void OPC_Str1 (CHAR *s, ADDRESS s__len, INT32 x)
 {
 	CHAR ch;
 	INT16 i;
@@ -156,7 +156,7 @@ static void OPC_Str1 (CHAR *s, LONGINT s__len, INT32 x)
 	__DEL(s);
 }
 
-static INT16 OPC_Length (CHAR *s, LONGINT s__len)
+static INT16 OPC_Length (CHAR *s, ADDRESS s__len)
 {
 	INT16 i;
 	i = 0;
@@ -166,7 +166,7 @@ static INT16 OPC_Length (CHAR *s, LONGINT s__len)
 	return i;
 }
 
-static INT16 OPC_PerfectHash (CHAR *s, LONGINT s__len)
+static INT16 OPC_PerfectHash (CHAR *s, ADDRESS s__len)
 {
 	INT16 i, h;
 	i = 0;
@@ -364,7 +364,7 @@ static void OPC_DeclareBase (OPT_Object dcl)
 		OPM_WriteString((CHAR*)"struct ", 8);
 		OPC_BegBlk();
 		OPC_BegStat();
-		OPC_Str1((CHAR*)"LONGINT len[#]", 15, nofdims);
+		OPC_Str1((CHAR*)"ADDRESS len[#]", 15, nofdims);
 		OPC_EndStat();
 		OPC_BegStat();
 		__NEW(obj, OPT_ObjDesc);
@@ -511,7 +511,7 @@ static void OPC_LenList (OPT_Object par, BOOLEAN ansiDefine, BOOLEAN showParamNa
 	typ = par->typ->BaseTyp;
 	while (typ->comp == 3) {
 		if (ansiDefine) {
-			OPM_WriteString((CHAR*)", LONGINT ", 11);
+			OPM_WriteString((CHAR*)", ADDRESS ", 11);
 		} else {
 			OPM_WriteString((CHAR*)", ", 3);
 		}
@@ -720,7 +720,7 @@ static void OPC_DefineType (OPT_Struct str)
 	}
 }
 
-static BOOLEAN OPC_Prefixed (OPT_ConstExt x, CHAR *y, LONGINT y__len)
+static BOOLEAN OPC_Prefixed (OPT_ConstExt x, CHAR *y, ADDRESS y__len)
 {
 	INT16 i;
 	__DUP(y, y__len, CHAR);
@@ -969,7 +969,7 @@ static void OPC_IdentList (OPT_Object obj, INT16 vis)
 				OPC_EndStat();
 				OPC_BegStat();
 				base = OPT_linttyp;
-				OPM_WriteString((CHAR*)"LONGINT ", 9);
+				OPM_WriteString((CHAR*)"ADDRESS ", 9);
 				OPC_LenList(obj, 0, 1);
 			} else if ((obj->mode == 2 && obj->typ->comp == 4)) {
 				OPC_EndStat();
@@ -1008,7 +1008,7 @@ static void OPC_AnsiParamList (OPT_Object obj, BOOLEAN showParamNames)
 				__COPY(name, obj->name, 256);
 			}
 			if (obj->typ->comp == 3) {
-				OPM_WriteString((CHAR*)", LONGINT ", 11);
+				OPM_WriteString((CHAR*)", ADDRESS ", 11);
 				OPC_LenList(obj, 1, showParamNames);
 			} else if ((obj->mode == 2 && obj->typ->comp == 4)) {
 				OPM_WriteString((CHAR*)", ADDRESS *", 12);
@@ -1062,7 +1062,7 @@ static void OPC_ProcPredefs (OPT_Object obj, INT8 vis)
 	}
 }
 
-static void OPC_Include (CHAR *name, LONGINT name__len)
+static void OPC_Include (CHAR *name, ADDRESS name__len)
 {
 	__DUP(name, name__len, CHAR);
 	OPM_WriteString((CHAR*)"#include ", 10);
@@ -1744,7 +1744,7 @@ static void OPC_CharacterLiteral (INT64 c)
 	}
 }
 
-static void OPC_StringLiteral (CHAR *s, LONGINT s__len, INT32 l)
+static void OPC_StringLiteral (CHAR *s, ADDRESS s__len, INT32 l)
 {
 	INT32 i;
 	INT16 c;
@@ -1912,9 +1912,9 @@ static struct InitKeywords__46 {
 	struct InitKeywords__46 *lnk;
 } *InitKeywords__46_s;
 
-static void Enter__47 (CHAR *s, LONGINT s__len);
+static void Enter__47 (CHAR *s, ADDRESS s__len);
 
-static void Enter__47 (CHAR *s, LONGINT s__len)
+static void Enter__47 (CHAR *s, ADDRESS s__len)
 {
 	INT16 h;
 	__DUP(s, s__len, CHAR);
diff --git a/bootstrap/windows-88/OPC.h b/bootstrap/windows-88/OPC.h
index 842e7dec..5624314d 100644
--- a/bootstrap/windows-88/OPC.h
+++ b/bootstrap/windows-88/OPC.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef OPC__h
 #define OPC__h
diff --git a/bootstrap/windows-88/OPM.c b/bootstrap/windows-88/OPM.c
index 60ab38c7..b2fd5536 100644
--- a/bootstrap/windows-88/OPM.c
+++ b/bootstrap/windows-88/OPM.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
@@ -53,26 +53,26 @@ export void OPM_FPrintLReal (INT32 *fp, LONGREAL val);
 export void OPM_FPrintReal (INT32 *fp, REAL val);
 export void OPM_FPrintSet (INT32 *fp, UINT64 val);
 static void OPM_FindLine (Files_File f, Files_Rider *r, ADDRESS *r__typ, INT64 pos);
-static void OPM_FingerprintBytes (INT32 *fp, SYSTEM_BYTE *bytes, LONGINT bytes__len);
+static void OPM_FingerprintBytes (INT32 *fp, SYSTEM_BYTE *bytes, ADDRESS bytes__len);
 export void OPM_Get (CHAR *ch);
-export void OPM_Init (BOOLEAN *done, CHAR *mname, LONGINT mname__len);
+export void OPM_Init (BOOLEAN *done, CHAR *mname, ADDRESS mname__len);
 export void OPM_InitOptions (void);
 export INT16 OPM_Integer (INT64 n);
 static void OPM_LogErrMsg (INT16 n);
-export void OPM_LogVT100 (CHAR *vt100code, LONGINT vt100code__len);
+export void OPM_LogVT100 (CHAR *vt100code, ADDRESS vt100code__len);
 export void OPM_LogW (CHAR ch);
 export void OPM_LogWLn (void);
 export void OPM_LogWNum (INT64 i, INT64 len);
-export void OPM_LogWStr (CHAR *s, LONGINT s__len);
+export void OPM_LogWStr (CHAR *s, ADDRESS s__len);
 export INT32 OPM_Longint (INT64 n);
-static void OPM_MakeFileName (CHAR *name, LONGINT name__len, CHAR *FName, LONGINT FName__len, CHAR *ext, LONGINT ext__len);
+static void OPM_MakeFileName (CHAR *name, ADDRESS name__len, CHAR *FName, ADDRESS FName__len, CHAR *ext, ADDRESS ext__len);
 export void OPM_Mark (INT16 n, INT32 pos);
-export void OPM_NewSym (CHAR *modName, LONGINT modName__len);
-export void OPM_OldSym (CHAR *modName, LONGINT modName__len, BOOLEAN *done);
-export void OPM_OpenFiles (CHAR *moduleName, LONGINT moduleName__len);
+export void OPM_NewSym (CHAR *modName, ADDRESS modName__len);
+export void OPM_OldSym (CHAR *modName, ADDRESS modName__len, BOOLEAN *done);
+export void OPM_OpenFiles (CHAR *moduleName, ADDRESS moduleName__len);
 export BOOLEAN OPM_OpenPar (void);
 export void OPM_RegisterNewSym (void);
-static void OPM_ScanOptions (CHAR *s, LONGINT s__len);
+static void OPM_ScanOptions (CHAR *s, ADDRESS s__len);
 static void OPM_ShowLine (INT64 pos);
 export INT64 OPM_SignedMaximum (INT32 bytecount);
 export INT64 OPM_SignedMinimum (INT32 bytecount);
@@ -93,8 +93,8 @@ export void OPM_WriteHex (INT64 i);
 export void OPM_WriteInt (INT64 i);
 export void OPM_WriteLn (void);
 export void OPM_WriteReal (LONGREAL r, CHAR suffx);
-export void OPM_WriteString (CHAR *s, LONGINT s__len);
-export void OPM_WriteStringVar (CHAR *s, LONGINT s__len);
+export void OPM_WriteString (CHAR *s, ADDRESS s__len);
+export void OPM_WriteStringVar (CHAR *s, ADDRESS s__len);
 export BOOLEAN OPM_eofSF (void);
 export void OPM_err (INT16 n);
 
@@ -105,7 +105,7 @@ void OPM_LogW (CHAR ch)
 	Out_Char(ch);
 }
 
-void OPM_LogWStr (CHAR *s, LONGINT s__len)
+void OPM_LogWStr (CHAR *s, ADDRESS s__len)
 {
 	__DUP(s, s__len, CHAR);
 	Out_String(s, s__len);
@@ -122,7 +122,7 @@ void OPM_LogWLn (void)
 	Out_Ln();
 }
 
-void OPM_LogVT100 (CHAR *vt100code, LONGINT vt100code__len)
+void OPM_LogVT100 (CHAR *vt100code, ADDRESS vt100code__len)
 {
 	__DUP(vt100code, vt100code__len, CHAR);
 	if ((Out_IsConsole && !__IN(16, OPM_Options, 32))) {
@@ -154,7 +154,7 @@ INT16 OPM_Integer (INT64 n)
 	return __VAL(INT16, n);
 }
 
-static void OPM_ScanOptions (CHAR *s, LONGINT s__len)
+static void OPM_ScanOptions (CHAR *s, ADDRESS s__len)
 {
 	INT16 i;
 	__DUP(s, s__len, CHAR);
@@ -465,7 +465,7 @@ void OPM_InitOptions (void)
 	Files_SetSearchPath(searchpath, 1024);
 }
 
-void OPM_Init (BOOLEAN *done, CHAR *mname, LONGINT mname__len)
+void OPM_Init (BOOLEAN *done, CHAR *mname, ADDRESS mname__len)
 {
 	Texts_Text T = NIL;
 	INT32 beg, end, time;
@@ -514,7 +514,7 @@ void OPM_Get (CHAR *ch)
 	}
 }
 
-static void OPM_MakeFileName (CHAR *name, LONGINT name__len, CHAR *FName, LONGINT FName__len, CHAR *ext, LONGINT ext__len)
+static void OPM_MakeFileName (CHAR *name, ADDRESS name__len, CHAR *FName, ADDRESS FName__len, CHAR *ext, ADDRESS ext__len)
 {
 	INT16 i, j;
 	CHAR ch;
@@ -700,7 +700,7 @@ void OPM_err (INT16 n)
 	OPM_Mark(n, OPM_errpos);
 }
 
-static void OPM_FingerprintBytes (INT32 *fp, SYSTEM_BYTE *bytes, LONGINT bytes__len)
+static void OPM_FingerprintBytes (INT32 *fp, SYSTEM_BYTE *bytes, ADDRESS bytes__len)
 {
 	INT16 i;
 	INT32 l;
@@ -772,7 +772,7 @@ void OPM_CloseOldSym (void)
 	Files_Close(Files_Base(&OPM_oldSF, Files_Rider__typ));
 }
 
-void OPM_OldSym (CHAR *modName, LONGINT modName__len, BOOLEAN *done)
+void OPM_OldSym (CHAR *modName, ADDRESS modName__len, BOOLEAN *done)
 {
 	CHAR tag, ver;
 	OPM_FileName fileName;
@@ -832,7 +832,7 @@ void OPM_DeleteNewSym (void)
 {
 }
 
-void OPM_NewSym (CHAR *modName, LONGINT modName__len)
+void OPM_NewSym (CHAR *modName, ADDRESS modName__len)
 {
 	OPM_FileName fileName;
 	OPM_MakeFileName((void*)modName, modName__len, (void*)fileName, 32, (CHAR*)".sym", 5);
@@ -851,7 +851,7 @@ void OPM_Write (CHAR ch)
 	Files_Write(&OPM_R[__X(OPM_currFile, 3)], Files_Rider__typ, ch);
 }
 
-void OPM_WriteString (CHAR *s, LONGINT s__len)
+void OPM_WriteString (CHAR *s, ADDRESS s__len)
 {
 	INT16 i;
 	i = 0;
@@ -861,7 +861,7 @@ void OPM_WriteString (CHAR *s, LONGINT s__len)
 	Files_WriteBytes(&OPM_R[__X(OPM_currFile, 3)], Files_Rider__typ, (void*)s, s__len * 1, i);
 }
 
-void OPM_WriteStringVar (CHAR *s, LONGINT s__len)
+void OPM_WriteStringVar (CHAR *s, ADDRESS s__len)
 {
 	INT16 i;
 	i = 0;
@@ -986,7 +986,7 @@ static void OPM_Append (Files_Rider *R, ADDRESS *R__typ, Files_File F)
 	}
 }
 
-void OPM_OpenFiles (CHAR *moduleName, LONGINT moduleName__len)
+void OPM_OpenFiles (CHAR *moduleName, ADDRESS moduleName__len)
 {
 	CHAR FName[32];
 	__COPY(moduleName, OPM_modName, 32);
diff --git a/bootstrap/windows-88/OPM.h b/bootstrap/windows-88/OPM.h
index 2d272feb..c310c421 100644
--- a/bootstrap/windows-88/OPM.h
+++ b/bootstrap/windows-88/OPM.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef OPM__h
 #define OPM__h
@@ -28,19 +28,19 @@ import void OPM_FPrintLReal (INT32 *fp, LONGREAL val);
 import void OPM_FPrintReal (INT32 *fp, REAL val);
 import void OPM_FPrintSet (INT32 *fp, UINT64 val);
 import void OPM_Get (CHAR *ch);
-import void OPM_Init (BOOLEAN *done, CHAR *mname, LONGINT mname__len);
+import void OPM_Init (BOOLEAN *done, CHAR *mname, ADDRESS mname__len);
 import void OPM_InitOptions (void);
 import INT16 OPM_Integer (INT64 n);
-import void OPM_LogVT100 (CHAR *vt100code, LONGINT vt100code__len);
+import void OPM_LogVT100 (CHAR *vt100code, ADDRESS vt100code__len);
 import void OPM_LogW (CHAR ch);
 import void OPM_LogWLn (void);
 import void OPM_LogWNum (INT64 i, INT64 len);
-import void OPM_LogWStr (CHAR *s, LONGINT s__len);
+import void OPM_LogWStr (CHAR *s, ADDRESS s__len);
 import INT32 OPM_Longint (INT64 n);
 import void OPM_Mark (INT16 n, INT32 pos);
-import void OPM_NewSym (CHAR *modName, LONGINT modName__len);
-import void OPM_OldSym (CHAR *modName, LONGINT modName__len, BOOLEAN *done);
-import void OPM_OpenFiles (CHAR *moduleName, LONGINT moduleName__len);
+import void OPM_NewSym (CHAR *modName, ADDRESS modName__len);
+import void OPM_OldSym (CHAR *modName, ADDRESS modName__len, BOOLEAN *done);
+import void OPM_OpenFiles (CHAR *moduleName, ADDRESS moduleName__len);
 import BOOLEAN OPM_OpenPar (void);
 import void OPM_RegisterNewSym (void);
 import INT64 OPM_SignedMaximum (INT32 bytecount);
@@ -61,8 +61,8 @@ import void OPM_WriteHex (INT64 i);
 import void OPM_WriteInt (INT64 i);
 import void OPM_WriteLn (void);
 import void OPM_WriteReal (LONGREAL r, CHAR suffx);
-import void OPM_WriteString (CHAR *s, LONGINT s__len);
-import void OPM_WriteStringVar (CHAR *s, LONGINT s__len);
+import void OPM_WriteString (CHAR *s, ADDRESS s__len);
+import void OPM_WriteStringVar (CHAR *s, ADDRESS s__len);
 import BOOLEAN OPM_eofSF (void);
 import void OPM_err (INT16 n);
 import void *OPM__init(void);
diff --git a/bootstrap/windows-88/OPP.c b/bootstrap/windows-88/OPP.c
index df908a43..e6b89be2 100644
--- a/bootstrap/windows-88/OPP.c
+++ b/bootstrap/windows-88/OPP.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/windows-88/OPP.h b/bootstrap/windows-88/OPP.h
index 5a71eb39..acb2df91 100644
--- a/bootstrap/windows-88/OPP.h
+++ b/bootstrap/windows-88/OPP.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef OPP__h
 #define OPP__h
diff --git a/bootstrap/windows-88/OPS.c b/bootstrap/windows-88/OPS.c
index 6ee700e5..7aedbbd6 100644
--- a/bootstrap/windows-88/OPS.c
+++ b/bootstrap/windows-88/OPS.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. tspaSF */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. tspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/windows-88/OPS.h b/bootstrap/windows-88/OPS.h
index 1f7a3e58..e49c222b 100644
--- a/bootstrap/windows-88/OPS.h
+++ b/bootstrap/windows-88/OPS.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. tspaSF */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. tspaSF */
 
 #ifndef OPS__h
 #define OPS__h
diff --git a/bootstrap/windows-88/OPT.c b/bootstrap/windows-88/OPT.c
index a8d42b40..4a900e78 100644
--- a/bootstrap/windows-88/OPT.c
+++ b/bootstrap/windows-88/OPT.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
@@ -120,7 +120,7 @@ static void OPT_EnterTyp (OPS_Name name, INT8 form, INT16 size, OPT_Struct *res)
 static void OPT_EnterTypeAlias (OPS_Name name, OPT_Object *res);
 export void OPT_Export (BOOLEAN *ext, BOOLEAN *new);
 export void OPT_FPrintErr (OPT_Object obj, INT16 errcode);
-static void OPT_FPrintName (INT32 *fp, CHAR *name, LONGINT name__len);
+static void OPT_FPrintName (INT32 *fp, CHAR *name, ADDRESS name__len);
 export void OPT_FPrintObj (OPT_Object obj);
 static void OPT_FPrintSign (INT32 *fp, OPT_Struct result, OPT_Object par);
 export void OPT_FPrintStr (OPT_Struct typ);
@@ -132,7 +132,7 @@ export void OPT_Import (OPS_Name aliasName, OPS_Name name, BOOLEAN *done);
 static void OPT_InConstant (INT32 f, OPT_Const conval);
 static OPT_Object OPT_InFld (void);
 static void OPT_InMod (INT8 *mno);
-static void OPT_InName (CHAR *name, LONGINT name__len);
+static void OPT_InName (CHAR *name, ADDRESS name__len);
 static OPT_Object OPT_InObj (INT8 mno);
 static void OPT_InSign (INT8 mno, OPT_Struct *res, OPT_Object *par);
 static void OPT_InStruct (OPT_Struct *typ);
@@ -155,7 +155,7 @@ static void OPT_OutConstant (OPT_Object obj);
 static void OPT_OutFlds (OPT_Object fld, INT32 adr, BOOLEAN visible);
 static void OPT_OutHdFld (OPT_Struct typ, OPT_Object fld, INT32 adr);
 static void OPT_OutMod (INT16 mno);
-static void OPT_OutName (CHAR *name, LONGINT name__len);
+static void OPT_OutName (CHAR *name, ADDRESS name__len);
 static void OPT_OutObj (OPT_Object obj);
 static void OPT_OutSign (OPT_Struct result, OPT_Object par);
 static void OPT_OutStr (OPT_Struct typ);
@@ -576,7 +576,7 @@ void OPT_Insert (OPS_Name name, OPT_Object *obj)
 	*obj = ob1;
 }
 
-static void OPT_FPrintName (INT32 *fp, CHAR *name, LONGINT name__len)
+static void OPT_FPrintName (INT32 *fp, CHAR *name, ADDRESS name__len)
 {
 	INT16 i;
 	CHAR ch;
@@ -957,7 +957,7 @@ void OPT_InsertImport (OPT_Object obj, OPT_Object *root, OPT_Object *old)
 	}
 }
 
-static void OPT_InName (CHAR *name, LONGINT name__len)
+static void OPT_InName (CHAR *name, ADDRESS name__len)
 {
 	INT16 i;
 	CHAR ch;
@@ -1483,7 +1483,7 @@ void OPT_Import (OPS_Name aliasName, OPS_Name name, BOOLEAN *done)
 	}
 }
 
-static void OPT_OutName (CHAR *name, LONGINT name__len)
+static void OPT_OutName (CHAR *name, ADDRESS name__len)
 {
 	INT16 i;
 	CHAR ch;
diff --git a/bootstrap/windows-88/OPT.h b/bootstrap/windows-88/OPT.h
index 90fcacf5..9d34cea9 100644
--- a/bootstrap/windows-88/OPT.h
+++ b/bootstrap/windows-88/OPT.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef OPT__h
 #define OPT__h
diff --git a/bootstrap/windows-88/OPV.c b/bootstrap/windows-88/OPV.c
index 4bd6b3fb..1b610f35 100644
--- a/bootstrap/windows-88/OPV.c
+++ b/bootstrap/windows-88/OPV.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/windows-88/OPV.h b/bootstrap/windows-88/OPV.h
index c4a61586..0f1980ac 100644
--- a/bootstrap/windows-88/OPV.h
+++ b/bootstrap/windows-88/OPV.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef OPV__h
 #define OPV__h
diff --git a/bootstrap/windows-88/Out.c b/bootstrap/windows-88/Out.c
index 720267fd..de9a7701 100644
--- a/bootstrap/windows-88/Out.c
+++ b/bootstrap/windows-88/Out.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
@@ -17,16 +17,16 @@ static INT16 Out_in;
 export void Out_Char (CHAR ch);
 export void Out_Flush (void);
 export void Out_Int (INT64 x, INT64 n);
-static INT32 Out_Length (CHAR *s, LONGINT s__len);
+static INT32 Out_Length (CHAR *s, ADDRESS s__len);
 export void Out_Ln (void);
 export void Out_LongReal (LONGREAL x, INT16 n);
 export void Out_Open (void);
 export void Out_Real (REAL x, INT16 n);
 static void Out_RealP (LONGREAL x, INT16 n, BOOLEAN long_);
-export void Out_String (CHAR *str, LONGINT str__len);
+export void Out_String (CHAR *str, ADDRESS str__len);
 export LONGREAL Out_Ten (INT16 e);
-static void Out_digit (INT64 n, CHAR *s, LONGINT s__len, INT16 *i);
-static void Out_prepend (CHAR *t, LONGINT t__len, CHAR *s, LONGINT s__len, INT16 *i);
+static void Out_digit (INT64 n, CHAR *s, ADDRESS s__len, INT16 *i);
+static void Out_prepend (CHAR *t, ADDRESS t__len, CHAR *s, ADDRESS s__len, INT16 *i);
 
 #define Out_Entier64(x)	(INT64)(x)
 
@@ -55,7 +55,7 @@ void Out_Char (CHAR ch)
 	}
 }
 
-static INT32 Out_Length (CHAR *s, LONGINT s__len)
+static INT32 Out_Length (CHAR *s, ADDRESS s__len)
 {
 	INT32 l;
 	l = 0;
@@ -65,7 +65,7 @@ static INT32 Out_Length (CHAR *s, LONGINT s__len)
 	return l;
 }
 
-void Out_String (CHAR *str, LONGINT str__len)
+void Out_String (CHAR *str, ADDRESS str__len)
 {
 	INT32 l;
 	INT16 error;
@@ -125,13 +125,13 @@ void Out_Ln (void)
 	Out_Flush();
 }
 
-static void Out_digit (INT64 n, CHAR *s, LONGINT s__len, INT16 *i)
+static void Out_digit (INT64 n, CHAR *s, ADDRESS s__len, INT16 *i)
 {
 	*i -= 1;
 	s[__X(*i, s__len)] = (CHAR)(__MOD(n, 10) + 48);
 }
 
-static void Out_prepend (CHAR *t, LONGINT t__len, CHAR *s, LONGINT s__len, INT16 *i)
+static void Out_prepend (CHAR *t, ADDRESS t__len, CHAR *s, ADDRESS s__len, INT16 *i)
 {
 	INT16 j;
 	INT32 l;
diff --git a/bootstrap/windows-88/Out.h b/bootstrap/windows-88/Out.h
index 0e66420d..d58a17d5 100644
--- a/bootstrap/windows-88/Out.h
+++ b/bootstrap/windows-88/Out.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef Out__h
 #define Out__h
@@ -16,7 +16,7 @@ import void Out_Ln (void);
 import void Out_LongReal (LONGREAL x, INT16 n);
 import void Out_Open (void);
 import void Out_Real (REAL x, INT16 n);
-import void Out_String (CHAR *str, LONGINT str__len);
+import void Out_String (CHAR *str, ADDRESS str__len);
 import LONGREAL Out_Ten (INT16 e);
 import void *Out__init(void);
 
diff --git a/bootstrap/windows-88/Platform.c b/bootstrap/windows-88/Platform.c
index 1e93deb2..9aa7ae12 100644
--- a/bootstrap/windows-88/Platform.c
+++ b/bootstrap/windows-88/Platform.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
@@ -48,8 +48,8 @@ export CHAR Platform_NL[3];
 export ADDRESS *Platform_FileIdentity__typ;
 
 export BOOLEAN Platform_Absent (INT16 e);
-export INT16 Platform_ArgPos (CHAR *s, LONGINT s__len);
-export INT16 Platform_Chdir (CHAR *n, LONGINT n__len);
+export INT16 Platform_ArgPos (CHAR *s, ADDRESS s__len);
+export INT16 Platform_Chdir (CHAR *n, ADDRESS n__len);
 export INT16 Platform_Close (INT64 h);
 export BOOLEAN Platform_ConnectionFailed (INT16 e);
 export void Platform_Delay (INT32 ms);
@@ -57,27 +57,27 @@ export BOOLEAN Platform_DifferentFilesystems (INT16 e);
 static void Platform_EnableVT100 (void);
 export INT16 Platform_Error (void);
 export void Platform_Exit (INT32 code);
-export void Platform_GetArg (INT16 n, CHAR *val, LONGINT val__len);
+export void Platform_GetArg (INT16 n, CHAR *val, ADDRESS val__len);
 export void Platform_GetClock (INT32 *t, INT32 *d);
-export void Platform_GetEnv (CHAR *var, LONGINT var__len, CHAR *val, LONGINT val__len);
+export void Platform_GetEnv (CHAR *var, ADDRESS var__len, CHAR *val, ADDRESS val__len);
 export void Platform_GetIntArg (INT16 n, INT32 *val);
 export void Platform_GetTimeOfDay (INT32 *sec, INT32 *usec);
 export INT16 Platform_Identify (INT64 h, Platform_FileIdentity *identity, ADDRESS *identity__typ);
-export INT16 Platform_IdentifyByName (CHAR *n, LONGINT n__len, Platform_FileIdentity *identity, ADDRESS *identity__typ);
+export INT16 Platform_IdentifyByName (CHAR *n, ADDRESS n__len, Platform_FileIdentity *identity, ADDRESS *identity__typ);
 export BOOLEAN Platform_Inaccessible (INT16 e);
 export void Platform_Init (INT32 argc, INT64 argvadr);
 export BOOLEAN Platform_Interrupted (INT16 e);
 export BOOLEAN Platform_IsConsole (INT64 h);
 export void Platform_MTimeAsClock (Platform_FileIdentity i, INT32 *t, INT32 *d);
-export INT16 Platform_New (CHAR *n, LONGINT n__len, INT64 *h);
+export INT16 Platform_New (CHAR *n, ADDRESS n__len, INT64 *h);
 export BOOLEAN Platform_NoSuchDirectory (INT16 e);
 export INT64 Platform_OSAllocate (INT64 size);
 export void Platform_OSFree (INT64 address);
-export INT16 Platform_OldRO (CHAR *n, LONGINT n__len, INT64 *h);
-export INT16 Platform_OldRW (CHAR *n, LONGINT n__len, INT64 *h);
+export INT16 Platform_OldRO (CHAR *n, ADDRESS n__len, INT64 *h);
+export INT16 Platform_OldRW (CHAR *n, ADDRESS n__len, INT64 *h);
 export INT16 Platform_Read (INT64 h, INT64 p, INT32 l, INT32 *n);
-export INT16 Platform_ReadBuf (INT64 h, SYSTEM_BYTE *b, LONGINT b__len, INT32 *n);
-export INT16 Platform_Rename (CHAR *o, LONGINT o__len, CHAR *n, LONGINT n__len);
+export INT16 Platform_ReadBuf (INT64 h, SYSTEM_BYTE *b, ADDRESS b__len, INT32 *n);
+export INT16 Platform_Rename (CHAR *o, ADDRESS o__len, CHAR *n, ADDRESS n__len);
 export BOOLEAN Platform_SameFile (Platform_FileIdentity i1, Platform_FileIdentity i2);
 export BOOLEAN Platform_SameFileTime (Platform_FileIdentity i1, Platform_FileIdentity i2);
 export INT16 Platform_Seek (INT64 h, INT32 o, INT16 r);
@@ -85,16 +85,16 @@ export void Platform_SetBadInstructionHandler (Platform_SignalHandler handler);
 export void Platform_SetMTime (Platform_FileIdentity *target, ADDRESS *target__typ, Platform_FileIdentity source);
 export INT16 Platform_Size (INT64 h, INT32 *l);
 export INT16 Platform_Sync (INT64 h);
-export INT16 Platform_System (CHAR *cmd, LONGINT cmd__len);
+export INT16 Platform_System (CHAR *cmd, ADDRESS cmd__len);
 static void Platform_TestLittleEndian (void);
 export INT32 Platform_Time (void);
 export BOOLEAN Platform_TimedOut (INT16 e);
 export BOOLEAN Platform_TooManyFiles (INT16 e);
 export INT16 Platform_Truncate (INT64 h, INT32 limit);
-export INT16 Platform_Unlink (CHAR *n, LONGINT n__len);
+export INT16 Platform_Unlink (CHAR *n, ADDRESS n__len);
 export INT16 Platform_Write (INT64 h, INT64 p, INT32 l);
 static void Platform_YMDHMStoClock (INT16 ye, INT16 mo, INT16 da, INT16 ho, INT16 mi, INT16 se, INT32 *t, INT32 *d);
-export BOOLEAN Platform_getEnv (CHAR *var, LONGINT var__len, CHAR *val, LONGINT val__len);
+export BOOLEAN Platform_getEnv (CHAR *var, ADDRESS var__len, CHAR *val, ADDRESS val__len);
 
 #include "WindowsWrapper.h"
 #define Platform_ECONNABORTED()	WSAECONNABORTED
@@ -239,7 +239,7 @@ void Platform_Init (INT32 argc, INT64 argvadr)
 	Platform_HeapInitHeap();
 }
 
-BOOLEAN Platform_getEnv (CHAR *var, LONGINT var__len, CHAR *val, LONGINT val__len)
+BOOLEAN Platform_getEnv (CHAR *var, ADDRESS var__len, CHAR *val, ADDRESS val__len)
 {
 	CHAR buf[4096];
 	INT16 res;
@@ -256,7 +256,7 @@ BOOLEAN Platform_getEnv (CHAR *var, LONGINT var__len, CHAR *val, LONGINT val__le
 	__RETCHK;
 }
 
-void Platform_GetEnv (CHAR *var, LONGINT var__len, CHAR *val, LONGINT val__len)
+void Platform_GetEnv (CHAR *var, ADDRESS var__len, CHAR *val, ADDRESS val__len)
 {
 	__DUP(var, var__len, CHAR);
 	if (!Platform_getEnv(var, var__len, (void*)val, val__len)) {
@@ -265,7 +265,7 @@ void Platform_GetEnv (CHAR *var, LONGINT var__len, CHAR *val, LONGINT val__len)
 	__DEL(var);
 }
 
-void Platform_GetArg (INT16 n, CHAR *val, LONGINT val__len)
+void Platform_GetArg (INT16 n, CHAR *val, ADDRESS val__len)
 {
 	Platform_ArgVec av = NIL;
 	if (n < Platform_ArgCount) {
@@ -300,7 +300,7 @@ void Platform_GetIntArg (INT16 n, INT32 *val)
 	}
 }
 
-INT16 Platform_ArgPos (CHAR *s, LONGINT s__len)
+INT16 Platform_ArgPos (CHAR *s, ADDRESS s__len)
 {
 	INT16 i;
 	CHAR arg[256];
@@ -359,7 +359,7 @@ void Platform_GetTimeOfDay (INT32 *sec, INT32 *usec)
 	*usec = Platform_uluSec();
 }
 
-INT16 Platform_System (CHAR *cmd, LONGINT cmd__len)
+INT16 Platform_System (CHAR *cmd, ADDRESS cmd__len)
 {
 	INT16 result;
 	__DUP(cmd, cmd__len, CHAR);
@@ -381,7 +381,7 @@ INT16 Platform_Error (void)
 	return Platform_err();
 }
 
-INT16 Platform_OldRO (CHAR *n, LONGINT n__len, INT64 *h)
+INT16 Platform_OldRO (CHAR *n, ADDRESS n__len, INT64 *h)
 {
 	INT64 fd;
 	fd = Platform_openro(n, n__len);
@@ -394,7 +394,7 @@ INT16 Platform_OldRO (CHAR *n, LONGINT n__len, INT64 *h)
 	__RETCHK;
 }
 
-INT16 Platform_OldRW (CHAR *n, LONGINT n__len, INT64 *h)
+INT16 Platform_OldRW (CHAR *n, ADDRESS n__len, INT64 *h)
 {
 	INT64 fd;
 	fd = Platform_openrw(n, n__len);
@@ -407,7 +407,7 @@ INT16 Platform_OldRW (CHAR *n, LONGINT n__len, INT64 *h)
 	__RETCHK;
 }
 
-INT16 Platform_New (CHAR *n, LONGINT n__len, INT64 *h)
+INT16 Platform_New (CHAR *n, ADDRESS n__len, INT64 *h)
 {
 	INT64 fd;
 	fd = Platform_opennew(n, n__len);
@@ -444,7 +444,7 @@ INT16 Platform_Identify (INT64 h, Platform_FileIdentity *identity, ADDRESS *iden
 	return 0;
 }
 
-INT16 Platform_IdentifyByName (CHAR *n, LONGINT n__len, Platform_FileIdentity *identity, ADDRESS *identity__typ)
+INT16 Platform_IdentifyByName (CHAR *n, ADDRESS n__len, Platform_FileIdentity *identity, ADDRESS *identity__typ)
 {
 	INT64 h;
 	INT16 e, i;
@@ -508,7 +508,7 @@ INT16 Platform_Read (INT64 h, INT64 p, INT32 l, INT32 *n)
 	__RETCHK;
 }
 
-INT16 Platform_ReadBuf (INT64 h, SYSTEM_BYTE *b, LONGINT b__len, INT32 *n)
+INT16 Platform_ReadBuf (INT64 h, SYSTEM_BYTE *b, ADDRESS b__len, INT32 *n)
 {
 	INT16 result;
 	INT32 lengthread;
@@ -580,7 +580,7 @@ INT16 Platform_Truncate (INT64 h, INT32 limit)
 	return 0;
 }
 
-INT16 Platform_Unlink (CHAR *n, LONGINT n__len)
+INT16 Platform_Unlink (CHAR *n, ADDRESS n__len)
 {
 	if (Platform_deleteFile(n, n__len) == 0) {
 		return Platform_err();
@@ -590,7 +590,7 @@ INT16 Platform_Unlink (CHAR *n, LONGINT n__len)
 	__RETCHK;
 }
 
-INT16 Platform_Chdir (CHAR *n, LONGINT n__len)
+INT16 Platform_Chdir (CHAR *n, ADDRESS n__len)
 {
 	INT16 r;
 	r = Platform_setCurrentDirectory(n, n__len);
@@ -601,7 +601,7 @@ INT16 Platform_Chdir (CHAR *n, LONGINT n__len)
 	return 0;
 }
 
-INT16 Platform_Rename (CHAR *o, LONGINT o__len, CHAR *n, LONGINT n__len)
+INT16 Platform_Rename (CHAR *o, ADDRESS o__len, CHAR *n, ADDRESS n__len)
 {
 	if (Platform_moveFile(o, o__len, n, n__len) == 0) {
 		return Platform_err();
diff --git a/bootstrap/windows-88/Platform.h b/bootstrap/windows-88/Platform.h
index f6a5d008..2d7faafb 100644
--- a/bootstrap/windows-88/Platform.h
+++ b/bootstrap/windows-88/Platform.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef Platform__h
 #define Platform__h
@@ -29,35 +29,35 @@ import CHAR Platform_NL[3];
 import ADDRESS *Platform_FileIdentity__typ;
 
 import BOOLEAN Platform_Absent (INT16 e);
-import INT16 Platform_ArgPos (CHAR *s, LONGINT s__len);
-import INT16 Platform_Chdir (CHAR *n, LONGINT n__len);
+import INT16 Platform_ArgPos (CHAR *s, ADDRESS s__len);
+import INT16 Platform_Chdir (CHAR *n, ADDRESS n__len);
 import INT16 Platform_Close (INT64 h);
 import BOOLEAN Platform_ConnectionFailed (INT16 e);
 import void Platform_Delay (INT32 ms);
 import BOOLEAN Platform_DifferentFilesystems (INT16 e);
 import INT16 Platform_Error (void);
 import void Platform_Exit (INT32 code);
-import void Platform_GetArg (INT16 n, CHAR *val, LONGINT val__len);
+import void Platform_GetArg (INT16 n, CHAR *val, ADDRESS val__len);
 import void Platform_GetClock (INT32 *t, INT32 *d);
-import void Platform_GetEnv (CHAR *var, LONGINT var__len, CHAR *val, LONGINT val__len);
+import void Platform_GetEnv (CHAR *var, ADDRESS var__len, CHAR *val, ADDRESS val__len);
 import void Platform_GetIntArg (INT16 n, INT32 *val);
 import void Platform_GetTimeOfDay (INT32 *sec, INT32 *usec);
 import INT16 Platform_Identify (INT64 h, Platform_FileIdentity *identity, ADDRESS *identity__typ);
-import INT16 Platform_IdentifyByName (CHAR *n, LONGINT n__len, Platform_FileIdentity *identity, ADDRESS *identity__typ);
+import INT16 Platform_IdentifyByName (CHAR *n, ADDRESS n__len, Platform_FileIdentity *identity, ADDRESS *identity__typ);
 import BOOLEAN Platform_Inaccessible (INT16 e);
 import void Platform_Init (INT32 argc, INT64 argvadr);
 import BOOLEAN Platform_Interrupted (INT16 e);
 import BOOLEAN Platform_IsConsole (INT64 h);
 import void Platform_MTimeAsClock (Platform_FileIdentity i, INT32 *t, INT32 *d);
-import INT16 Platform_New (CHAR *n, LONGINT n__len, INT64 *h);
+import INT16 Platform_New (CHAR *n, ADDRESS n__len, INT64 *h);
 import BOOLEAN Platform_NoSuchDirectory (INT16 e);
 import INT64 Platform_OSAllocate (INT64 size);
 import void Platform_OSFree (INT64 address);
-import INT16 Platform_OldRO (CHAR *n, LONGINT n__len, INT64 *h);
-import INT16 Platform_OldRW (CHAR *n, LONGINT n__len, INT64 *h);
+import INT16 Platform_OldRO (CHAR *n, ADDRESS n__len, INT64 *h);
+import INT16 Platform_OldRW (CHAR *n, ADDRESS n__len, INT64 *h);
 import INT16 Platform_Read (INT64 h, INT64 p, INT32 l, INT32 *n);
-import INT16 Platform_ReadBuf (INT64 h, SYSTEM_BYTE *b, LONGINT b__len, INT32 *n);
-import INT16 Platform_Rename (CHAR *o, LONGINT o__len, CHAR *n, LONGINT n__len);
+import INT16 Platform_ReadBuf (INT64 h, SYSTEM_BYTE *b, ADDRESS b__len, INT32 *n);
+import INT16 Platform_Rename (CHAR *o, ADDRESS o__len, CHAR *n, ADDRESS n__len);
 import BOOLEAN Platform_SameFile (Platform_FileIdentity i1, Platform_FileIdentity i2);
 import BOOLEAN Platform_SameFileTime (Platform_FileIdentity i1, Platform_FileIdentity i2);
 import INT16 Platform_Seek (INT64 h, INT32 o, INT16 r);
@@ -65,14 +65,14 @@ import void Platform_SetBadInstructionHandler (Platform_SignalHandler handler);
 import void Platform_SetMTime (Platform_FileIdentity *target, ADDRESS *target__typ, Platform_FileIdentity source);
 import INT16 Platform_Size (INT64 h, INT32 *l);
 import INT16 Platform_Sync (INT64 h);
-import INT16 Platform_System (CHAR *cmd, LONGINT cmd__len);
+import INT16 Platform_System (CHAR *cmd, ADDRESS cmd__len);
 import INT32 Platform_Time (void);
 import BOOLEAN Platform_TimedOut (INT16 e);
 import BOOLEAN Platform_TooManyFiles (INT16 e);
 import INT16 Platform_Truncate (INT64 h, INT32 limit);
-import INT16 Platform_Unlink (CHAR *n, LONGINT n__len);
+import INT16 Platform_Unlink (CHAR *n, ADDRESS n__len);
 import INT16 Platform_Write (INT64 h, INT64 p, INT32 l);
-import BOOLEAN Platform_getEnv (CHAR *var, LONGINT var__len, CHAR *val, LONGINT val__len);
+import BOOLEAN Platform_getEnv (CHAR *var, ADDRESS var__len, CHAR *val, ADDRESS val__len);
 import void *Platform__init(void);
 
 #define Platform_SetInterruptHandler(h)	SystemSetInterruptHandler((ADDRESS)h)
diff --git a/bootstrap/windows-88/Reals.c b/bootstrap/windows-88/Reals.c
index cd4c3c61..be3ad909 100644
--- a/bootstrap/windows-88/Reals.c
+++ b/bootstrap/windows-88/Reals.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
@@ -10,11 +10,11 @@
 
 
 
-static void Reals_BytesToHex (SYSTEM_BYTE *b, LONGINT b__len, SYSTEM_BYTE *d, LONGINT d__len);
-export void Reals_Convert (REAL x, INT16 n, CHAR *d, LONGINT d__len);
-export void Reals_ConvertH (REAL y, CHAR *d, LONGINT d__len);
-export void Reals_ConvertHL (LONGREAL x, CHAR *d, LONGINT d__len);
-export void Reals_ConvertL (LONGREAL x, INT16 n, CHAR *d, LONGINT d__len);
+static void Reals_BytesToHex (SYSTEM_BYTE *b, ADDRESS b__len, SYSTEM_BYTE *d, ADDRESS d__len);
+export void Reals_Convert (REAL x, INT16 n, CHAR *d, ADDRESS d__len);
+export void Reals_ConvertH (REAL y, CHAR *d, ADDRESS d__len);
+export void Reals_ConvertHL (LONGREAL x, CHAR *d, ADDRESS d__len);
+export void Reals_ConvertL (LONGREAL x, INT16 n, CHAR *d, ADDRESS d__len);
 export INT16 Reals_Expo (REAL x);
 export INT16 Reals_ExpoL (LONGREAL x);
 export void Reals_SetExpo (REAL *x, INT16 ex);
@@ -79,7 +79,7 @@ INT16 Reals_ExpoL (LONGREAL x)
 	return __MASK(__ASHR(i, 4), -2048);
 }
 
-void Reals_ConvertL (LONGREAL x, INT16 n, CHAR *d, LONGINT d__len)
+void Reals_ConvertL (LONGREAL x, INT16 n, CHAR *d, ADDRESS d__len)
 {
 	INT32 i, j, k;
 	if (x < (LONGREAL)0) {
@@ -107,7 +107,7 @@ void Reals_ConvertL (LONGREAL x, INT16 n, CHAR *d, LONGINT d__len)
 	}
 }
 
-void Reals_Convert (REAL x, INT16 n, CHAR *d, LONGINT d__len)
+void Reals_Convert (REAL x, INT16 n, CHAR *d, ADDRESS d__len)
 {
 	Reals_ConvertL(x, n, (void*)d, d__len);
 }
@@ -122,7 +122,7 @@ static CHAR Reals_ToHex (INT16 i)
 	__RETCHK;
 }
 
-static void Reals_BytesToHex (SYSTEM_BYTE *b, LONGINT b__len, SYSTEM_BYTE *d, LONGINT d__len)
+static void Reals_BytesToHex (SYSTEM_BYTE *b, ADDRESS b__len, SYSTEM_BYTE *d, ADDRESS d__len)
 {
 	INT16 i;
 	INT32 l;
@@ -137,12 +137,12 @@ static void Reals_BytesToHex (SYSTEM_BYTE *b, LONGINT b__len, SYSTEM_BYTE *d, LO
 	}
 }
 
-void Reals_ConvertH (REAL y, CHAR *d, LONGINT d__len)
+void Reals_ConvertH (REAL y, CHAR *d, ADDRESS d__len)
 {
 	Reals_BytesToHex((void*)&y, 4, (void*)d, d__len * 1);
 }
 
-void Reals_ConvertHL (LONGREAL x, CHAR *d, LONGINT d__len)
+void Reals_ConvertHL (LONGREAL x, CHAR *d, ADDRESS d__len)
 {
 	Reals_BytesToHex((void*)&x, 8, (void*)d, d__len * 1);
 }
diff --git a/bootstrap/windows-88/Reals.h b/bootstrap/windows-88/Reals.h
index f0c84ab1..e8d15a2f 100644
--- a/bootstrap/windows-88/Reals.h
+++ b/bootstrap/windows-88/Reals.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef Reals__h
 #define Reals__h
@@ -8,10 +8,10 @@
 
 
 
-import void Reals_Convert (REAL x, INT16 n, CHAR *d, LONGINT d__len);
-import void Reals_ConvertH (REAL y, CHAR *d, LONGINT d__len);
-import void Reals_ConvertHL (LONGREAL x, CHAR *d, LONGINT d__len);
-import void Reals_ConvertL (LONGREAL x, INT16 n, CHAR *d, LONGINT d__len);
+import void Reals_Convert (REAL x, INT16 n, CHAR *d, ADDRESS d__len);
+import void Reals_ConvertH (REAL y, CHAR *d, ADDRESS d__len);
+import void Reals_ConvertHL (LONGREAL x, CHAR *d, ADDRESS d__len);
+import void Reals_ConvertL (LONGREAL x, INT16 n, CHAR *d, ADDRESS d__len);
 import INT16 Reals_Expo (REAL x);
 import INT16 Reals_ExpoL (LONGREAL x);
 import void Reals_SetExpo (REAL *x, INT16 ex);
diff --git a/bootstrap/windows-88/Strings.c b/bootstrap/windows-88/Strings.c
index b5707327..fd550df3 100644
--- a/bootstrap/windows-88/Strings.c
+++ b/bootstrap/windows-88/Strings.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
@@ -10,18 +10,18 @@
 
 
 
-export void Strings_Append (CHAR *extra, LONGINT extra__len, CHAR *dest, LONGINT dest__len);
-export void Strings_Cap (CHAR *s, LONGINT s__len);
-export void Strings_Delete (CHAR *s, LONGINT s__len, INT16 pos, INT16 n);
-export void Strings_Extract (CHAR *source, LONGINT source__len, INT16 pos, INT16 n, CHAR *dest, LONGINT dest__len);
-export void Strings_Insert (CHAR *source, LONGINT source__len, INT16 pos, CHAR *dest, LONGINT dest__len);
-export INT16 Strings_Length (CHAR *s, LONGINT s__len);
-export BOOLEAN Strings_Match (CHAR *string, LONGINT string__len, CHAR *pattern, LONGINT pattern__len);
-export INT16 Strings_Pos (CHAR *pattern, LONGINT pattern__len, CHAR *s, LONGINT s__len, INT16 pos);
-export void Strings_Replace (CHAR *source, LONGINT source__len, INT16 pos, CHAR *dest, LONGINT dest__len);
+export void Strings_Append (CHAR *extra, ADDRESS extra__len, CHAR *dest, ADDRESS dest__len);
+export void Strings_Cap (CHAR *s, ADDRESS s__len);
+export void Strings_Delete (CHAR *s, ADDRESS s__len, INT16 pos, INT16 n);
+export void Strings_Extract (CHAR *source, ADDRESS source__len, INT16 pos, INT16 n, CHAR *dest, ADDRESS dest__len);
+export void Strings_Insert (CHAR *source, ADDRESS source__len, INT16 pos, CHAR *dest, ADDRESS dest__len);
+export INT16 Strings_Length (CHAR *s, ADDRESS s__len);
+export BOOLEAN Strings_Match (CHAR *string, ADDRESS string__len, CHAR *pattern, ADDRESS pattern__len);
+export INT16 Strings_Pos (CHAR *pattern, ADDRESS pattern__len, CHAR *s, ADDRESS s__len, INT16 pos);
+export void Strings_Replace (CHAR *source, ADDRESS source__len, INT16 pos, CHAR *dest, ADDRESS dest__len);
 
 
-INT16 Strings_Length (CHAR *s, LONGINT s__len)
+INT16 Strings_Length (CHAR *s, ADDRESS s__len)
 {
 	INT32 i;
 	__DUP(s, s__len, CHAR);
@@ -39,7 +39,7 @@ INT16 Strings_Length (CHAR *s, LONGINT s__len)
 	__RETCHK;
 }
 
-void Strings_Append (CHAR *extra, LONGINT extra__len, CHAR *dest, LONGINT dest__len)
+void Strings_Append (CHAR *extra, ADDRESS extra__len, CHAR *dest, ADDRESS dest__len)
 {
 	INT16 n1, n2, i;
 	__DUP(extra, extra__len, CHAR);
@@ -56,7 +56,7 @@ void Strings_Append (CHAR *extra, LONGINT extra__len, CHAR *dest, LONGINT dest__
 	__DEL(extra);
 }
 
-void Strings_Insert (CHAR *source, LONGINT source__len, INT16 pos, CHAR *dest, LONGINT dest__len)
+void Strings_Insert (CHAR *source, ADDRESS source__len, INT16 pos, CHAR *dest, ADDRESS dest__len)
 {
 	INT16 n1, n2, i;
 	__DUP(source, source__len, CHAR);
@@ -87,7 +87,7 @@ void Strings_Insert (CHAR *source, LONGINT source__len, INT16 pos, CHAR *dest, L
 	__DEL(source);
 }
 
-void Strings_Delete (CHAR *s, LONGINT s__len, INT16 pos, INT16 n)
+void Strings_Delete (CHAR *s, ADDRESS s__len, INT16 pos, INT16 n)
 {
 	INT16 len, i;
 	len = Strings_Length(s, s__len);
@@ -110,7 +110,7 @@ void Strings_Delete (CHAR *s, LONGINT s__len, INT16 pos, INT16 n)
 	}
 }
 
-void Strings_Replace (CHAR *source, LONGINT source__len, INT16 pos, CHAR *dest, LONGINT dest__len)
+void Strings_Replace (CHAR *source, ADDRESS source__len, INT16 pos, CHAR *dest, ADDRESS dest__len)
 {
 	__DUP(source, source__len, CHAR);
 	Strings_Delete((void*)dest, dest__len, pos, pos + Strings_Length(source, source__len));
@@ -118,7 +118,7 @@ void Strings_Replace (CHAR *source, LONGINT source__len, INT16 pos, CHAR *dest,
 	__DEL(source);
 }
 
-void Strings_Extract (CHAR *source, LONGINT source__len, INT16 pos, INT16 n, CHAR *dest, LONGINT dest__len)
+void Strings_Extract (CHAR *source, ADDRESS source__len, INT16 pos, INT16 n, CHAR *dest, ADDRESS dest__len)
 {
 	INT16 len, destLen, i;
 	__DUP(source, source__len, CHAR);
@@ -143,7 +143,7 @@ void Strings_Extract (CHAR *source, LONGINT source__len, INT16 pos, INT16 n, CHA
 	__DEL(source);
 }
 
-INT16 Strings_Pos (CHAR *pattern, LONGINT pattern__len, CHAR *s, LONGINT s__len, INT16 pos)
+INT16 Strings_Pos (CHAR *pattern, ADDRESS pattern__len, CHAR *s, ADDRESS s__len, INT16 pos)
 {
 	INT16 n1, n2, i, j;
 	__DUP(pattern, pattern__len, CHAR);
@@ -175,7 +175,7 @@ INT16 Strings_Pos (CHAR *pattern, LONGINT pattern__len, CHAR *s, LONGINT s__len,
 	return -1;
 }
 
-void Strings_Cap (CHAR *s, LONGINT s__len)
+void Strings_Cap (CHAR *s, ADDRESS s__len)
 {
 	INT16 i;
 	i = 0;
@@ -191,9 +191,9 @@ static struct Match__7 {
 	struct Match__7 *lnk;
 } *Match__7_s;
 
-static BOOLEAN M__8 (CHAR *name, LONGINT name__len, CHAR *mask, LONGINT mask__len, INT16 n, INT16 m);
+static BOOLEAN M__8 (CHAR *name, ADDRESS name__len, CHAR *mask, ADDRESS mask__len, INT16 n, INT16 m);
 
-static BOOLEAN M__8 (CHAR *name, LONGINT name__len, CHAR *mask, LONGINT mask__len, INT16 n, INT16 m)
+static BOOLEAN M__8 (CHAR *name, ADDRESS name__len, CHAR *mask, ADDRESS mask__len, INT16 n, INT16 m)
 {
 	while ((((n >= 0 && m >= 0)) && mask[__X(m, mask__len)] != '*')) {
 		if (name[__X(n, name__len)] != mask[__X(m, mask__len)]) {
@@ -220,7 +220,7 @@ static BOOLEAN M__8 (CHAR *name, LONGINT name__len, CHAR *mask, LONGINT mask__le
 	return 0;
 }
 
-BOOLEAN Strings_Match (CHAR *string, LONGINT string__len, CHAR *pattern, LONGINT pattern__len)
+BOOLEAN Strings_Match (CHAR *string, ADDRESS string__len, CHAR *pattern, ADDRESS pattern__len)
 {
 	struct Match__7 _s;
 	BOOLEAN __retval;
diff --git a/bootstrap/windows-88/Strings.h b/bootstrap/windows-88/Strings.h
index c987af8d..76cb022d 100644
--- a/bootstrap/windows-88/Strings.h
+++ b/bootstrap/windows-88/Strings.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef Strings__h
 #define Strings__h
@@ -8,15 +8,15 @@
 
 
 
-import void Strings_Append (CHAR *extra, LONGINT extra__len, CHAR *dest, LONGINT dest__len);
-import void Strings_Cap (CHAR *s, LONGINT s__len);
-import void Strings_Delete (CHAR *s, LONGINT s__len, INT16 pos, INT16 n);
-import void Strings_Extract (CHAR *source, LONGINT source__len, INT16 pos, INT16 n, CHAR *dest, LONGINT dest__len);
-import void Strings_Insert (CHAR *source, LONGINT source__len, INT16 pos, CHAR *dest, LONGINT dest__len);
-import INT16 Strings_Length (CHAR *s, LONGINT s__len);
-import BOOLEAN Strings_Match (CHAR *string, LONGINT string__len, CHAR *pattern, LONGINT pattern__len);
-import INT16 Strings_Pos (CHAR *pattern, LONGINT pattern__len, CHAR *s, LONGINT s__len, INT16 pos);
-import void Strings_Replace (CHAR *source, LONGINT source__len, INT16 pos, CHAR *dest, LONGINT dest__len);
+import void Strings_Append (CHAR *extra, ADDRESS extra__len, CHAR *dest, ADDRESS dest__len);
+import void Strings_Cap (CHAR *s, ADDRESS s__len);
+import void Strings_Delete (CHAR *s, ADDRESS s__len, INT16 pos, INT16 n);
+import void Strings_Extract (CHAR *source, ADDRESS source__len, INT16 pos, INT16 n, CHAR *dest, ADDRESS dest__len);
+import void Strings_Insert (CHAR *source, ADDRESS source__len, INT16 pos, CHAR *dest, ADDRESS dest__len);
+import INT16 Strings_Length (CHAR *s, ADDRESS s__len);
+import BOOLEAN Strings_Match (CHAR *string, ADDRESS string__len, CHAR *pattern, ADDRESS pattern__len);
+import INT16 Strings_Pos (CHAR *pattern, ADDRESS pattern__len, CHAR *s, ADDRESS s__len, INT16 pos);
+import void Strings_Replace (CHAR *source, ADDRESS source__len, INT16 pos, CHAR *dest, ADDRESS dest__len);
 import void *Strings__init(void);
 
 
diff --git a/bootstrap/windows-88/Texts.c b/bootstrap/windows-88/Texts.c
index ae12961b..7182a772 100644
--- a/bootstrap/windows-88/Texts.c
+++ b/bootstrap/windows-88/Texts.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
@@ -187,20 +187,20 @@ export void Texts_Append (Texts_Text T, Texts_Buffer B);
 export void Texts_ChangeLooks (Texts_Text T, INT32 beg, INT32 end, UINT32 sel, Texts_FontsFont fnt, INT8 col, INT8 voff);
 static Texts_Elem Texts_CloneElem (Texts_Elem e);
 static Texts_Piece Texts_ClonePiece (Texts_Piece p);
-export void Texts_Close (Texts_Text T, CHAR *name, LONGINT name__len);
+export void Texts_Close (Texts_Text T, CHAR *name, ADDRESS name__len);
 export void Texts_Copy (Texts_Buffer SB, Texts_Buffer DB);
 export void Texts_CopyElem (Texts_Elem SE, Texts_Elem DE);
 export void Texts_Delete (Texts_Text T, INT32 beg, INT32 end);
 export Texts_Text Texts_ElemBase (Texts_Elem E);
 export INT32 Texts_ElemPos (Texts_Elem E);
 static void Texts_Find (Texts_Text T, INT32 *pos, Texts_Run *u, INT32 *org, INT32 *off);
-static Texts_FontsFont Texts_FontsThis (CHAR *name, LONGINT name__len);
+static Texts_FontsFont Texts_FontsThis (CHAR *name, ADDRESS name__len);
 static void Texts_HandleAlien (Texts_Elem E, Texts_ElemMsg *msg, ADDRESS *msg__typ);
 export void Texts_Insert (Texts_Text T, INT32 pos, Texts_Buffer B);
 export void Texts_Load (Files_Rider *r, ADDRESS *r__typ, Texts_Text T);
 static void Texts_Load0 (Files_Rider *r, ADDRESS *r__typ, Texts_Text T);
 static void Texts_Merge (Texts_Text T, Texts_Run u, Texts_Run *v);
-export void Texts_Open (Texts_Text T, CHAR *name, LONGINT name__len);
+export void Texts_Open (Texts_Text T, CHAR *name, ADDRESS name__len);
 export void Texts_OpenBuf (Texts_Buffer B);
 export void Texts_OpenReader (Texts_Reader *R, ADDRESS *R__typ, Texts_Text T, INT32 pos);
 export void Texts_OpenScanner (Texts_Scanner *S, ADDRESS *S__typ, Texts_Text T, INT32 pos);
@@ -229,10 +229,10 @@ export void Texts_WriteLongRealHex (Texts_Writer *W, ADDRESS *W__typ, LONGREAL x
 export void Texts_WriteReal (Texts_Writer *W, ADDRESS *W__typ, REAL x, INT16 n);
 export void Texts_WriteRealFix (Texts_Writer *W, ADDRESS *W__typ, REAL x, INT16 n, INT16 k);
 export void Texts_WriteRealHex (Texts_Writer *W, ADDRESS *W__typ, REAL x);
-export void Texts_WriteString (Texts_Writer *W, ADDRESS *W__typ, CHAR *s, LONGINT s__len);
+export void Texts_WriteString (Texts_Writer *W, ADDRESS *W__typ, CHAR *s, ADDRESS s__len);
 
 
-static Texts_FontsFont Texts_FontsThis (CHAR *name, LONGINT name__len)
+static Texts_FontsFont Texts_FontsThis (CHAR *name, ADDRESS name__len)
 {
 	Texts_FontsFont F = NIL;
 	__NEW(F, Texts_FontDesc);
@@ -1027,7 +1027,7 @@ void Texts_WriteLn (Texts_Writer *W, ADDRESS *W__typ)
 	Texts_Write(&*W, W__typ, 0x0d);
 }
 
-void Texts_WriteString (Texts_Writer *W, ADDRESS *W__typ, CHAR *s, LONGINT s__len)
+void Texts_WriteString (Texts_Writer *W, ADDRESS *W__typ, CHAR *s, ADDRESS s__len)
 {
 	INT16 i;
 	__DUP(s, s__len, CHAR);
@@ -1539,7 +1539,7 @@ void Texts_Load (Files_Rider *r, ADDRESS *r__typ, Texts_Text T)
 	Texts_Load0(&*r, r__typ, T);
 }
 
-void Texts_Open (Texts_Text T, CHAR *name, LONGINT name__len)
+void Texts_Open (Texts_Text T, CHAR *name, ADDRESS name__len)
 {
 	Files_File f = NIL;
 	Files_Rider r;
@@ -1755,7 +1755,7 @@ void Texts_Store (Files_Rider *r, ADDRESS *r__typ, Texts_Text T)
 	Store__39_s = _s.lnk;
 }
 
-void Texts_Close (Texts_Text T, CHAR *name, LONGINT name__len)
+void Texts_Close (Texts_Text T, CHAR *name, ADDRESS name__len)
 {
 	Files_File f = NIL;
 	Files_Rider r;
diff --git a/bootstrap/windows-88/Texts.h b/bootstrap/windows-88/Texts.h
index 61a97dda..e8735b00 100644
--- a/bootstrap/windows-88/Texts.h
+++ b/bootstrap/windows-88/Texts.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef Texts__h
 #define Texts__h
@@ -131,7 +131,7 @@ import ADDRESS *Texts_Writer__typ;
 
 import void Texts_Append (Texts_Text T, Texts_Buffer B);
 import void Texts_ChangeLooks (Texts_Text T, INT32 beg, INT32 end, UINT32 sel, Texts_FontsFont fnt, INT8 col, INT8 voff);
-import void Texts_Close (Texts_Text T, CHAR *name, LONGINT name__len);
+import void Texts_Close (Texts_Text T, CHAR *name, ADDRESS name__len);
 import void Texts_Copy (Texts_Buffer SB, Texts_Buffer DB);
 import void Texts_CopyElem (Texts_Elem SE, Texts_Elem DE);
 import void Texts_Delete (Texts_Text T, INT32 beg, INT32 end);
@@ -139,7 +139,7 @@ import Texts_Text Texts_ElemBase (Texts_Elem E);
 import INT32 Texts_ElemPos (Texts_Elem E);
 import void Texts_Insert (Texts_Text T, INT32 pos, Texts_Buffer B);
 import void Texts_Load (Files_Rider *r, ADDRESS *r__typ, Texts_Text T);
-import void Texts_Open (Texts_Text T, CHAR *name, LONGINT name__len);
+import void Texts_Open (Texts_Text T, CHAR *name, ADDRESS name__len);
 import void Texts_OpenBuf (Texts_Buffer B);
 import void Texts_OpenReader (Texts_Reader *R, ADDRESS *R__typ, Texts_Text T, INT32 pos);
 import void Texts_OpenScanner (Texts_Scanner *S, ADDRESS *S__typ, Texts_Text T, INT32 pos);
@@ -166,7 +166,7 @@ import void Texts_WriteLongRealHex (Texts_Writer *W, ADDRESS *W__typ, LONGREAL x
 import void Texts_WriteReal (Texts_Writer *W, ADDRESS *W__typ, REAL x, INT16 n);
 import void Texts_WriteRealFix (Texts_Writer *W, ADDRESS *W__typ, REAL x, INT16 n, INT16 k);
 import void Texts_WriteRealHex (Texts_Writer *W, ADDRESS *W__typ, REAL x);
-import void Texts_WriteString (Texts_Writer *W, ADDRESS *W__typ, CHAR *s, LONGINT s__len);
+import void Texts_WriteString (Texts_Writer *W, ADDRESS *W__typ, CHAR *s, ADDRESS s__len);
 import void *Texts__init(void);
 
 
diff --git a/bootstrap/windows-88/VT100.c b/bootstrap/windows-88/VT100.c
index f69fd90e..38c0743f 100644
--- a/bootstrap/windows-88/VT100.c
+++ b/bootstrap/windows-88/VT100.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
@@ -27,23 +27,23 @@ export void VT100_DECTCEMl (void);
 export void VT100_DSR (INT16 n);
 export void VT100_ED (INT16 n);
 export void VT100_EL (INT16 n);
-static void VT100_EscSeq (INT16 n, CHAR *letter, LONGINT letter__len);
-static void VT100_EscSeq0 (CHAR *letter, LONGINT letter__len);
-static void VT100_EscSeq2 (INT16 n, INT16 m, CHAR *letter, LONGINT letter__len);
-static void VT100_EscSeqSwapped (INT16 n, CHAR *letter, LONGINT letter__len);
+static void VT100_EscSeq (INT16 n, CHAR *letter, ADDRESS letter__len);
+static void VT100_EscSeq0 (CHAR *letter, ADDRESS letter__len);
+static void VT100_EscSeq2 (INT16 n, INT16 m, CHAR *letter, ADDRESS letter__len);
+static void VT100_EscSeqSwapped (INT16 n, CHAR *letter, ADDRESS letter__len);
 export void VT100_HVP (INT16 n, INT16 m);
-export void VT100_IntToStr (INT32 int_, CHAR *str, LONGINT str__len);
+export void VT100_IntToStr (INT32 int_, CHAR *str, ADDRESS str__len);
 export void VT100_RCP (void);
-static void VT100_Reverse0 (CHAR *str, LONGINT str__len, INT16 start, INT16 end);
+static void VT100_Reverse0 (CHAR *str, ADDRESS str__len, INT16 start, INT16 end);
 export void VT100_SCP (void);
 export void VT100_SD (INT16 n);
 export void VT100_SGR (INT16 n);
 export void VT100_SGR2 (INT16 n, INT16 m);
 export void VT100_SU (INT16 n);
-export void VT100_SetAttr (CHAR *attr, LONGINT attr__len);
+export void VT100_SetAttr (CHAR *attr, ADDRESS attr__len);
 
 
-static void VT100_Reverse0 (CHAR *str, LONGINT str__len, INT16 start, INT16 end)
+static void VT100_Reverse0 (CHAR *str, ADDRESS str__len, INT16 start, INT16 end)
 {
 	CHAR h;
 	while (start < end) {
@@ -55,7 +55,7 @@ static void VT100_Reverse0 (CHAR *str, LONGINT str__len, INT16 start, INT16 end)
 	}
 }
 
-void VT100_IntToStr (INT32 int_, CHAR *str, LONGINT str__len)
+void VT100_IntToStr (INT32 int_, CHAR *str, ADDRESS str__len)
 {
 	CHAR b[21];
 	INT16 s, e;
@@ -84,7 +84,7 @@ void VT100_IntToStr (INT32 int_, CHAR *str, LONGINT str__len)
 	__COPY(b, str, str__len);
 }
 
-static void VT100_EscSeq0 (CHAR *letter, LONGINT letter__len)
+static void VT100_EscSeq0 (CHAR *letter, ADDRESS letter__len)
 {
 	CHAR cmd[9];
 	__DUP(letter, letter__len, CHAR);
@@ -94,7 +94,7 @@ static void VT100_EscSeq0 (CHAR *letter, LONGINT letter__len)
 	__DEL(letter);
 }
 
-static void VT100_EscSeq (INT16 n, CHAR *letter, LONGINT letter__len)
+static void VT100_EscSeq (INT16 n, CHAR *letter, ADDRESS letter__len)
 {
 	CHAR nstr[2];
 	CHAR cmd[7];
@@ -107,7 +107,7 @@ static void VT100_EscSeq (INT16 n, CHAR *letter, LONGINT letter__len)
 	__DEL(letter);
 }
 
-static void VT100_EscSeqSwapped (INT16 n, CHAR *letter, LONGINT letter__len)
+static void VT100_EscSeqSwapped (INT16 n, CHAR *letter, ADDRESS letter__len)
 {
 	CHAR nstr[2];
 	CHAR cmd[7];
@@ -120,7 +120,7 @@ static void VT100_EscSeqSwapped (INT16 n, CHAR *letter, LONGINT letter__len)
 	__DEL(letter);
 }
 
-static void VT100_EscSeq2 (INT16 n, INT16 m, CHAR *letter, LONGINT letter__len)
+static void VT100_EscSeq2 (INT16 n, INT16 m, CHAR *letter, ADDRESS letter__len)
 {
 	CHAR nstr[5], mstr[5];
 	CHAR cmd[12];
@@ -236,7 +236,7 @@ void VT100_DECTCEMh (void)
 	VT100_EscSeq0((CHAR*)"\?25h", 5);
 }
 
-void VT100_SetAttr (CHAR *attr, LONGINT attr__len)
+void VT100_SetAttr (CHAR *attr, ADDRESS attr__len)
 {
 	CHAR tmpstr[16];
 	__DUP(attr, attr__len, CHAR);
diff --git a/bootstrap/windows-88/VT100.h b/bootstrap/windows-88/VT100.h
index d99406ec..4bbb3110 100644
--- a/bootstrap/windows-88/VT100.h
+++ b/bootstrap/windows-88/VT100.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef VT100__h
 #define VT100__h
@@ -23,14 +23,14 @@ import void VT100_DSR (INT16 n);
 import void VT100_ED (INT16 n);
 import void VT100_EL (INT16 n);
 import void VT100_HVP (INT16 n, INT16 m);
-import void VT100_IntToStr (INT32 int_, CHAR *str, LONGINT str__len);
+import void VT100_IntToStr (INT32 int_, CHAR *str, ADDRESS str__len);
 import void VT100_RCP (void);
 import void VT100_SCP (void);
 import void VT100_SD (INT16 n);
 import void VT100_SGR (INT16 n);
 import void VT100_SGR2 (INT16 n, INT16 m);
 import void VT100_SU (INT16 n);
-import void VT100_SetAttr (CHAR *attr, LONGINT attr__len);
+import void VT100_SetAttr (CHAR *attr, ADDRESS attr__len);
 import void *VT100__init(void);
 
 
diff --git a/bootstrap/windows-88/extTools.c b/bootstrap/windows-88/extTools.c
index 37630d23..66f80319 100644
--- a/bootstrap/windows-88/extTools.c
+++ b/bootstrap/windows-88/extTools.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
@@ -17,13 +17,13 @@
 static CHAR extTools_CFLAGS[1023];
 
 
-export void extTools_Assemble (CHAR *moduleName, LONGINT moduleName__len);
-static void extTools_InitialiseCompilerCommand (CHAR *s, LONGINT s__len);
-export void extTools_LinkMain (CHAR *moduleName, LONGINT moduleName__len, BOOLEAN statically, CHAR *additionalopts, LONGINT additionalopts__len);
-static void extTools_execute (CHAR *title, LONGINT title__len, CHAR *cmd, LONGINT cmd__len);
+export void extTools_Assemble (CHAR *moduleName, ADDRESS moduleName__len);
+static void extTools_InitialiseCompilerCommand (CHAR *s, ADDRESS s__len);
+export void extTools_LinkMain (CHAR *moduleName, ADDRESS moduleName__len, BOOLEAN statically, CHAR *additionalopts, ADDRESS additionalopts__len);
+static void extTools_execute (CHAR *title, ADDRESS title__len, CHAR *cmd, ADDRESS cmd__len);
 
 
-static void extTools_execute (CHAR *title, LONGINT title__len, CHAR *cmd, LONGINT cmd__len)
+static void extTools_execute (CHAR *title, ADDRESS title__len, CHAR *cmd, ADDRESS cmd__len)
 {
 	INT16 r, status, exitcode;
 	__DUP(title, title__len, CHAR);
@@ -63,7 +63,7 @@ static void extTools_execute (CHAR *title, LONGINT title__len, CHAR *cmd, LONGIN
 	__DEL(cmd);
 }
 
-static void extTools_InitialiseCompilerCommand (CHAR *s, LONGINT s__len)
+static void extTools_InitialiseCompilerCommand (CHAR *s, ADDRESS s__len)
 {
 	__COPY("gcc -g", s, s__len);
 	Strings_Append((CHAR*)" -I \"", 6, (void*)s, s__len);
@@ -74,7 +74,7 @@ static void extTools_InitialiseCompilerCommand (CHAR *s, LONGINT s__len)
 	Strings_Append((CHAR*)" ", 2, (void*)s, s__len);
 }
 
-void extTools_Assemble (CHAR *moduleName, LONGINT moduleName__len)
+void extTools_Assemble (CHAR *moduleName, ADDRESS moduleName__len)
 {
 	CHAR cmd[1023];
 	__DUP(moduleName, moduleName__len, CHAR);
@@ -86,7 +86,7 @@ void extTools_Assemble (CHAR *moduleName, LONGINT moduleName__len)
 	__DEL(moduleName);
 }
 
-void extTools_LinkMain (CHAR *moduleName, LONGINT moduleName__len, BOOLEAN statically, CHAR *additionalopts, LONGINT additionalopts__len)
+void extTools_LinkMain (CHAR *moduleName, ADDRESS moduleName__len, BOOLEAN statically, CHAR *additionalopts, ADDRESS additionalopts__len)
 {
 	CHAR cmd[1023];
 	__DUP(additionalopts, additionalopts__len, CHAR);
diff --git a/bootstrap/windows-88/extTools.h b/bootstrap/windows-88/extTools.h
index 63e5df15..472c60f3 100644
--- a/bootstrap/windows-88/extTools.h
+++ b/bootstrap/windows-88/extTools.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/11/25]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef extTools__h
 #define extTools__h
@@ -8,8 +8,8 @@
 
 
 
-import void extTools_Assemble (CHAR *moduleName, LONGINT moduleName__len);
-import void extTools_LinkMain (CHAR *moduleName, LONGINT moduleName__len, BOOLEAN statically, CHAR *additionalopts, LONGINT additionalopts__len);
+import void extTools_Assemble (CHAR *moduleName, ADDRESS moduleName__len);
+import void extTools_LinkMain (CHAR *moduleName, ADDRESS moduleName__len, BOOLEAN statically, CHAR *additionalopts, ADDRESS additionalopts__len);
 import void *extTools__init(void);