diff --git a/bootstrap/unix-44/Compiler.c b/bootstrap/unix-44/Compiler.c
index 10abd264..9cdbb76c 100644
--- a/bootstrap/unix-44/Compiler.c
+++ b/bootstrap/unix-44/Compiler.c
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. xtspamS */
+/* voc 2.1.0 [2018/04/24]. 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 8eac398d..3ab08d40 100644
--- a/bootstrap/unix-44/Configuration.c
+++ b/bootstrap/unix-44/Configuration.c
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.1.0 [2018/04/24]. 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("2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8.", Configuration_versionLong, 76);
+	__MOVE("2.1.0 [2018/04/24]. Bootstrapping compiler for address size 8, alignment 8.", Configuration_versionLong, 76);
 	__ENDMOD;
 }
diff --git a/bootstrap/unix-44/Configuration.h b/bootstrap/unix-44/Configuration.h
index c817585e..7db28b57 100644
--- a/bootstrap/unix-44/Configuration.h
+++ b/bootstrap/unix-44/Configuration.h
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.1.0 [2018/04/24]. 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 333bdb63..78f0f4e9 100644
--- a/bootstrap/unix-44/Files.c
+++ b/bootstrap/unix-44/Files.c
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. tspaSF */
+/* voc 2.1.0 [2018/04/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
@@ -154,20 +154,20 @@ static void Files_MakeFileName (CHAR *dir, ADDRESS dir__len, CHAR *name, ADDRESS
 	__DUP(name, name__len, CHAR);
 	i = 0;
 	j = 0;
-	while (dir[i] != 0x00) {
-		dest[i] = dir[i];
+	while (dir[__X(i, dir__len)] != 0x00) {
+		dest[__X(i, dest__len)] = dir[__X(i, dir__len)];
 		i += 1;
 	}
-	if (dest[i - 1] != '/') {
-		dest[i] = '/';
+	if (dest[__X(i - 1, dest__len)] != '/') {
+		dest[__X(i, dest__len)] = '/';
 		i += 1;
 	}
-	while (name[j] != 0x00) {
-		dest[i] = name[j];
+	while (name[__X(j, name__len)] != 0x00) {
+		dest[__X(i, dest__len)] = name[__X(j, name__len)];
 		i += 1;
 		j += 1;
 	}
-	dest[i] = 0x00;
+	dest[__X(i, dest__len)] = 0x00;
 	__DEL(dir);
 	__DEL(name);
 }
@@ -180,45 +180,45 @@ static void Files_GetTempName (CHAR *finalName, ADDRESS finalName__len, CHAR *na
 	n = Files_tempno;
 	i = 0;
 	if (finalName[0] != '/') {
-		while (Platform_CWD[i] != 0x00) {
-			name[i] = Platform_CWD[i];
+		while (Platform_CWD[__X(i, 256)] != 0x00) {
+			name[__X(i, name__len)] = Platform_CWD[__X(i, 256)];
 			i += 1;
 		}
-		if (Platform_CWD[i - 1] != '/') {
-			name[i] = '/';
+		if (Platform_CWD[__X(i - 1, 256)] != '/') {
+			name[__X(i, name__len)] = '/';
 			i += 1;
 		}
 	}
 	j = 0;
-	while (finalName[j] != 0x00) {
-		name[i] = finalName[j];
+	while (finalName[__X(j, finalName__len)] != 0x00) {
+		name[__X(i, name__len)] = finalName[__X(j, finalName__len)];
 		i += 1;
 		j += 1;
 	}
 	i -= 1;
-	while (name[i] != '/') {
+	while (name[__X(i, name__len)] != '/') {
 		i -= 1;
 	}
-	name[i + 1] = '.';
-	name[i + 2] = 't';
-	name[i + 3] = 'm';
-	name[i + 4] = 'p';
-	name[i + 5] = '.';
+	name[__X(i + 1, name__len)] = '.';
+	name[__X(i + 2, name__len)] = 't';
+	name[__X(i + 3, name__len)] = 'm';
+	name[__X(i + 4, name__len)] = 'p';
+	name[__X(i + 5, name__len)] = '.';
 	i += 6;
 	while (n > 0) {
-		name[i] = (CHAR)((int)__MOD(n, 10) + 48);
+		name[__X(i, name__len)] = (CHAR)((int)__MOD(n, 10) + 48);
 		n = __DIV(n, 10);
 		i += 1;
 	}
-	name[i] = '.';
+	name[__X(i, name__len)] = '.';
 	i += 1;
 	n = Platform_PID;
 	while (n > 0) {
-		name[i] = (CHAR)((int)__MOD(n, 10) + 48);
+		name[__X(i, name__len)] = (CHAR)((int)__MOD(n, 10) + 48);
 		n = __DIV(n, 10);
 		i += 1;
 	}
-	name[i] = 0x00;
+	name[__X(i, name__len)] = 0x00;
 	__DEL(finalName);
 }
 
@@ -319,8 +319,8 @@ void Files_Close (Files_File f)
 	if (f->state != 1 || f->registerName[0] != 0x00) {
 		Files_Create(f);
 		i = 0;
-		while ((i < 4 && f->bufs[i] != NIL)) {
-			Files_Flush(f->bufs[i]);
+		while ((i < 4 && f->bufs[__X(i, 4)] != NIL)) {
+			Files_Flush(f->bufs[__X(i, 4)]);
 			i += 1;
 		}
 	}
@@ -359,35 +359,35 @@ static void Files_ScanPath (INT16 *pos, CHAR *dir, ADDRESS dir__len)
 			*pos += 1;
 		}
 	} else {
-		ch = (Files_SearchPath->data)[*pos];
+		ch = (Files_SearchPath->data)[__X(*pos, Files_SearchPath->len[0])];
 		while (ch == ' ' || ch == ';') {
 			*pos += 1;
-			ch = (Files_SearchPath->data)[*pos];
+			ch = (Files_SearchPath->data)[__X(*pos, Files_SearchPath->len[0])];
 		}
 		if (ch == '~') {
 			*pos += 1;
-			ch = (Files_SearchPath->data)[*pos];
-			while (Files_HOME[i] != 0x00) {
-				dir[i] = Files_HOME[i];
+			ch = (Files_SearchPath->data)[__X(*pos, Files_SearchPath->len[0])];
+			while (Files_HOME[__X(i, 1024)] != 0x00) {
+				dir[__X(i, dir__len)] = Files_HOME[__X(i, 1024)];
 				i += 1;
 			}
 			if ((((((ch != '/' && ch != 0x00)) && ch != ';')) && ch != ' ')) {
-				while ((i > 0 && dir[i - 1] != '/')) {
+				while ((i > 0 && dir[__X(i - 1, dir__len)] != '/')) {
 					i -= 1;
 				}
 			}
 		}
 		while ((ch != 0x00 && ch != ';')) {
-			dir[i] = ch;
+			dir[__X(i, dir__len)] = ch;
 			i += 1;
 			*pos += 1;
-			ch = (Files_SearchPath->data)[*pos];
+			ch = (Files_SearchPath->data)[__X(*pos, Files_SearchPath->len[0])];
 		}
-		while ((i > 0 && dir[i - 1] == ' ')) {
+		while ((i > 0 && dir[__X(i - 1, dir__len)] == ' ')) {
 			i -= 1;
 		}
 	}
-	dir[i] = 0x00;
+	dir[__X(i, dir__len)] = 0x00;
 }
 
 static BOOLEAN Files_HasDir (CHAR *name, ADDRESS name__len)
@@ -398,7 +398,7 @@ static BOOLEAN Files_HasDir (CHAR *name, ADDRESS name__len)
 	ch = name[0];
 	while ((ch != 0x00 && ch != '/')) {
 		i += 1;
-		ch = name[i];
+		ch = name[__X(i, name__len)];
 	}
 	return ch == '/';
 }
@@ -413,9 +413,9 @@ static Files_File Files_CacheEntry (Platform_FileIdentity identity)
 			if (!Platform_SameFileTime(identity, f->identity)) {
 				i = 0;
 				while (i < 4) {
-					if (f->bufs[i] != NIL) {
-						f->bufs[i]->org = -1;
-						f->bufs[i] = NIL;
+					if (f->bufs[__X(i, 4)] != NIL) {
+						f->bufs[__X(i, 4)]->org = -1;
+						f->bufs[__X(i, 4)] = NIL;
 					}
 					i += 1;
 				}
@@ -514,9 +514,9 @@ void Files_Purge (Files_File f)
 	INT16 error;
 	i = 0;
 	while (i < 4) {
-		if (f->bufs[i] != NIL) {
-			f->bufs[i]->org = -1;
-			f->bufs[i] = NIL;
+		if (f->bufs[__X(i, 4)] != NIL) {
+			f->bufs[__X(i, 4)]->org = -1;
+			f->bufs[__X(i, 4)] = NIL;
 		}
 		i += 1;
 	}
@@ -560,22 +560,22 @@ void Files_Set (Files_Rider *r, ADDRESS *r__typ, Files_File f, INT32 pos)
 		offset = __MASK(pos, -4096);
 		org = pos - offset;
 		i = 0;
-		while ((((i < 4 && f->bufs[i] != NIL)) && org != f->bufs[i]->org)) {
+		while ((((i < 4 && f->bufs[__X(i, 4)] != NIL)) && org != f->bufs[__X(i, 4)]->org)) {
 			i += 1;
 		}
 		if (i < 4) {
-			if (f->bufs[i] == NIL) {
+			if (f->bufs[__X(i, 4)] == NIL) {
 				__NEW(buf, Files_BufDesc);
 				buf->chg = 0;
 				buf->org = -1;
 				buf->f = f;
-				f->bufs[i] = buf;
+				f->bufs[__X(i, 4)] = buf;
 			} else {
-				buf = f->bufs[i];
+				buf = f->bufs[__X(i, 4)];
 			}
 		} else {
 			f->swapper = __MASK(f->swapper + 1, -4);
-			buf = f->bufs[f->swapper];
+			buf = f->bufs[__X(f->swapper, 4)];
 			Files_Flush(buf);
 		}
 		if (buf->org != org) {
@@ -622,7 +622,7 @@ void Files_Read (Files_Rider *r, ADDRESS *r__typ, SYSTEM_BYTE *x)
 	}
 	Files_Assert(offset <= buf->size);
 	if (offset < buf->size) {
-		*x = buf->data[offset];
+		*x = buf->data[__X(offset, 4096)];
 		(*r).offset = offset + 1;
 	} else if ((*r).org + offset < buf->f->len) {
 		Files_Set(&*r, r__typ, (*r).buf->f, (*r).org + offset);
@@ -660,7 +660,7 @@ void Files_ReadBytes (Files_Rider *r, ADDRESS *r__typ, SYSTEM_BYTE *x, ADDRESS x
 		} else {
 			min = n;
 		}
-		__MOVE((ADDRESS)&buf->data[offset], (ADDRESS)&x[xpos], min);
+		__MOVE((ADDRESS)&buf->data[__X(offset, 4096)], (ADDRESS)&x[__X(xpos, x__len)], min);
 		offset += min;
 		(*r).offset = offset;
 		xpos += min;
@@ -689,7 +689,7 @@ void Files_Write (Files_Rider *r, ADDRESS *r__typ, SYSTEM_BYTE x)
 		offset = (*r).offset;
 	}
 	Files_Assert(offset < 4096);
-	buf->data[offset] = x;
+	buf->data[__X(offset, 4096)] = x;
 	buf->chg = 1;
 	if (offset == buf->size) {
 		buf->size += 1;
@@ -723,7 +723,7 @@ void Files_WriteBytes (Files_Rider *r, ADDRESS *r__typ, SYSTEM_BYTE *x, ADDRESS
 		} else {
 			min = n;
 		}
-		__MOVE((ADDRESS)&x[xpos], (ADDRESS)&buf->data[offset], min);
+		__MOVE((ADDRESS)&x[__X(xpos, x__len)], (ADDRESS)&buf->data[__X(offset, 4096)], min);
 		offset += min;
 		(*r).offset = offset;
 		Files_Assert(offset <= 4096);
@@ -843,7 +843,7 @@ static void Files_FlipBytes (SYSTEM_BYTE *src, ADDRESS src__len, SYSTEM_BYTE *de
 		j = 0;
 		while (i > 0) {
 			i -= 1;
-			dest[j] = src[i];
+			dest[__X(j, dest__len)] = src[__X(i, src__len)];
 			j += 1;
 		}
 	} else {
@@ -900,7 +900,7 @@ void Files_ReadString (Files_Rider *R, ADDRESS *R__typ, CHAR *x, ADDRESS x__len)
 	i = 0;
 	do {
 		Files_Read(&*R, R__typ, (void*)&ch);
-		x[i] = ch;
+		x[__X(i, x__len)] = ch;
 		i += 1;
 	} while (!(ch == 0x00));
 }
@@ -910,16 +910,16 @@ void Files_ReadLine (Files_Rider *R, ADDRESS *R__typ, CHAR *x, ADDRESS x__len)
 	INT16 i;
 	i = 0;
 	do {
-		Files_Read(&*R, R__typ, (void*)&x[i]);
+		Files_Read(&*R, R__typ, (void*)&x[__X(i, x__len)]);
 		i += 1;
-	} while (!(x[i - 1] == 0x00 || x[i - 1] == 0x0a));
-	if (x[i - 1] == 0x0a) {
+	} while (!(x[__X(i - 1, x__len)] == 0x00 || x[__X(i - 1, x__len)] == 0x0a));
+	if (x[__X(i - 1, x__len)] == 0x0a) {
 		i -= 1;
 	}
-	if ((i > 0 && x[i - 1] == 0x0d)) {
+	if ((i > 0 && x[__X(i - 1, x__len)] == 0x0d)) {
 		i -= 1;
 	}
-	x[i] = 0x00;
+	x[__X(i, x__len)] = 0x00;
 }
 
 void Files_ReadNum (Files_Rider *R, ADDRESS *R__typ, SYSTEM_BYTE *x, ADDRESS x__len)
@@ -992,7 +992,7 @@ void Files_WriteString (Files_Rider *R, ADDRESS *R__typ, CHAR *x, ADDRESS x__len
 {
 	INT16 i;
 	i = 0;
-	while (x[i] != 0x00) {
+	while (x[__X(i, x__len)] != 0x00) {
 		i += 1;
 	}
 	Files_WriteBytes(&*R, R__typ, (void*)x, x__len * 1, i + 1);
diff --git a/bootstrap/unix-44/Files.h b/bootstrap/unix-44/Files.h
index 8c775fa4..a0bced1c 100644
--- a/bootstrap/unix-44/Files.h
+++ b/bootstrap/unix-44/Files.h
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. tspaSF */
+/* voc 2.1.0 [2018/04/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef Files__h
 #define Files__h
diff --git a/bootstrap/unix-44/Heap.c b/bootstrap/unix-44/Heap.c
index 348b336b..bd4ed5a8 100644
--- a/bootstrap/unix-44/Heap.c
+++ b/bootstrap/unix-44/Heap.c
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. tsSF */
+/* voc 2.1.0 [2018/04/24]. Bootstrapping compiler for address size 8, alignment 8. tsSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/unix-44/Heap.h b/bootstrap/unix-44/Heap.h
index b73de4fe..8d7eb8e5 100644
--- a/bootstrap/unix-44/Heap.h
+++ b/bootstrap/unix-44/Heap.h
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. tsSF */
+/* voc 2.1.0 [2018/04/24]. 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 89f370a7..8ae1f5fb 100644
--- a/bootstrap/unix-44/Modules.c
+++ b/bootstrap/unix-44/Modules.c
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.1.0 [2018/04/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/unix-44/Modules.h b/bootstrap/unix-44/Modules.h
index 2d074a62..9d10f4ac 100644
--- a/bootstrap/unix-44/Modules.h
+++ b/bootstrap/unix-44/Modules.h
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.1.0 [2018/04/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef Modules__h
 #define Modules__h
diff --git a/bootstrap/unix-44/OPB.c b/bootstrap/unix-44/OPB.c
index 41e56e38..d7012f3e 100644
--- a/bootstrap/unix-44/OPB.c
+++ b/bootstrap/unix-44/OPB.c
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.1.0 [2018/04/24]. 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 0eba52d2..b82bf9ba 100644
--- a/bootstrap/unix-44/OPB.h
+++ b/bootstrap/unix-44/OPB.h
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.1.0 [2018/04/24]. 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 7fa9fa23..42cd3c56 100644
--- a/bootstrap/unix-44/OPC.c
+++ b/bootstrap/unix-44/OPC.c
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.1.0 [2018/04/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/unix-44/OPC.h b/bootstrap/unix-44/OPC.h
index 1e17f6c2..b79317f7 100644
--- a/bootstrap/unix-44/OPC.h
+++ b/bootstrap/unix-44/OPC.h
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.1.0 [2018/04/24]. 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 3dbed3bf..e6b33367 100644
--- a/bootstrap/unix-44/OPM.c
+++ b/bootstrap/unix-44/OPM.c
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.1.0 [2018/04/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/unix-44/OPM.h b/bootstrap/unix-44/OPM.h
index 9c84b7af..1c6ca2ac 100644
--- a/bootstrap/unix-44/OPM.h
+++ b/bootstrap/unix-44/OPM.h
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.1.0 [2018/04/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef OPM__h
 #define OPM__h
diff --git a/bootstrap/unix-44/OPP.c b/bootstrap/unix-44/OPP.c
index 00e4fa0e..54a9f7c8 100644
--- a/bootstrap/unix-44/OPP.c
+++ b/bootstrap/unix-44/OPP.c
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.1.0 [2018/04/24]. 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 010479f8..52242f7c 100644
--- a/bootstrap/unix-44/OPP.h
+++ b/bootstrap/unix-44/OPP.h
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.1.0 [2018/04/24]. 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 74719041..0e42294b 100644
--- a/bootstrap/unix-44/OPS.c
+++ b/bootstrap/unix-44/OPS.c
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. tspaSF */
+/* voc 2.1.0 [2018/04/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
@@ -56,11 +56,11 @@ static void OPS_Str (INT8 *sym)
 			OPS_err(241);
 			break;
 		}
-		OPS_str[i] = OPS_ch;
+		OPS_str[__X(i, 256)] = OPS_ch;
 		i += 1;
 	}
 	OPM_Get(&OPS_ch);
-	OPS_str[i] = 0x00;
+	OPS_str[__X(i, 256)] = 0x00;
 	OPS_intval = i + 1;
 	if (OPS_intval == 2) {
 		*sym = 35;
@@ -76,7 +76,7 @@ static void OPS_Identifier (INT8 *sym)
 	INT16 i;
 	i = 0;
 	do {
-		OPS_name[i] = OPS_ch;
+		OPS_name[__X(i, 256)] = OPS_ch;
 		i += 1;
 		OPM_Get(&OPS_ch);
 	} while (!(((OPS_ch < '0' || ('9' < OPS_ch && __CAP(OPS_ch) < 'A')) || 'Z' < __CAP(OPS_ch)) || i == 256));
@@ -84,7 +84,7 @@ static void OPS_Identifier (INT8 *sym)
 		OPS_err(240);
 		i -= 1;
 	}
-	OPS_name[i] = 0x00;
+	OPS_name[__X(i, 256)] = 0x00;
 	*sym = 38;
 }
 
@@ -143,7 +143,7 @@ static void OPS_Number (void)
 		if (('0' <= OPS_ch && OPS_ch <= '9') || (((d == 0 && 'A' <= OPS_ch)) && OPS_ch <= 'F')) {
 			if (m > 0 || OPS_ch != '0') {
 				if (n < 24) {
-					dig[n] = OPS_ch;
+					dig[__X(n, 24)] = OPS_ch;
 					n += 1;
 				}
 				m += 1;
@@ -173,7 +173,7 @@ static void OPS_Number (void)
 				OPS_numtyp = 1;
 				if (n <= 2) {
 					while (i < n) {
-						OPS_intval = __ASHL(OPS_intval, 4) + (INT64)Ord__7(dig[i], 1);
+						OPS_intval = __ASHL(OPS_intval, 4) + (INT64)Ord__7(dig[__X(i, 24)], 1);
 						i += 1;
 					}
 				} else {
@@ -187,7 +187,7 @@ static void OPS_Number (void)
 						OPS_intval = -1;
 					}
 					while (i < n) {
-						OPS_intval = __ASHL(OPS_intval, 4) + (INT64)Ord__7(dig[i], 1);
+						OPS_intval = __ASHL(OPS_intval, 4) + (INT64)Ord__7(dig[__X(i, 24)], 1);
 						i += 1;
 					}
 				} else {
@@ -196,7 +196,7 @@ static void OPS_Number (void)
 			} else {
 				OPS_numtyp = 2;
 				while (i < n) {
-					d = Ord__7(dig[i], 0);
+					d = Ord__7(dig[__X(i, 24)], 0);
 					i += 1;
 					if (OPS_intval <= __DIV(9223372036854775807LL - (INT64)d, 10)) {
 						OPS_intval = OPS_intval * 10 + (INT64)d;
@@ -214,7 +214,7 @@ static void OPS_Number (void)
 		expCh = 'E';
 		while (n > 0) {
 			n -= 1;
-			f = (Ord__7(dig[n], 0) + f) / (LONGREAL)(LONGREAL)10;
+			f = (Ord__7(dig[__X(n, 24)], 0) + f) / (LONGREAL)(LONGREAL)10;
 		}
 		if (OPS_ch == 'E' || OPS_ch == 'D') {
 			expCh = OPS_ch;
diff --git a/bootstrap/unix-44/OPS.h b/bootstrap/unix-44/OPS.h
index dfe2b972..15cdcc6c 100644
--- a/bootstrap/unix-44/OPS.h
+++ b/bootstrap/unix-44/OPS.h
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. tspaSF */
+/* voc 2.1.0 [2018/04/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef OPS__h
 #define OPS__h
diff --git a/bootstrap/unix-44/OPT.c b/bootstrap/unix-44/OPT.c
index d6a4c67b..bc38d46b 100644
--- a/bootstrap/unix-44/OPT.c
+++ b/bootstrap/unix-44/OPT.c
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.1.0 [2018/04/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/unix-44/OPT.h b/bootstrap/unix-44/OPT.h
index f457c51e..a4688654 100644
--- a/bootstrap/unix-44/OPT.h
+++ b/bootstrap/unix-44/OPT.h
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.1.0 [2018/04/24]. 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 5193f272..ebe18cc4 100644
--- a/bootstrap/unix-44/OPV.c
+++ b/bootstrap/unix-44/OPV.c
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.1.0 [2018/04/24]. 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 bee5e44d..05e906a7 100644
--- a/bootstrap/unix-44/OPV.h
+++ b/bootstrap/unix-44/OPV.h
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.1.0 [2018/04/24]. 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 54d88edf..fc5b46c6 100644
--- a/bootstrap/unix-44/Out.c
+++ b/bootstrap/unix-44/Out.c
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.1.0 [2018/04/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/unix-44/Out.h b/bootstrap/unix-44/Out.h
index fad5cd1a..0819285a 100644
--- a/bootstrap/unix-44/Out.h
+++ b/bootstrap/unix-44/Out.h
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.1.0 [2018/04/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef Out__h
 #define Out__h
diff --git a/bootstrap/unix-44/Platform.c b/bootstrap/unix-44/Platform.c
index 86284785..b5bf3da8 100644
--- a/bootstrap/unix-44/Platform.c
+++ b/bootstrap/unix-44/Platform.c
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.1.0 [2018/04/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/unix-44/Platform.h b/bootstrap/unix-44/Platform.h
index c4f8841c..6c2d79c8 100644
--- a/bootstrap/unix-44/Platform.h
+++ b/bootstrap/unix-44/Platform.h
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.1.0 [2018/04/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef Platform__h
 #define Platform__h
diff --git a/bootstrap/unix-44/Reals.c b/bootstrap/unix-44/Reals.c
index 2af2574f..44be33b7 100644
--- a/bootstrap/unix-44/Reals.c
+++ b/bootstrap/unix-44/Reals.c
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.1.0 [2018/04/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/unix-44/Reals.h b/bootstrap/unix-44/Reals.h
index 07f4371d..7c2e0e35 100644
--- a/bootstrap/unix-44/Reals.h
+++ b/bootstrap/unix-44/Reals.h
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.1.0 [2018/04/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef Reals__h
 #define Reals__h
diff --git a/bootstrap/unix-44/Strings.c b/bootstrap/unix-44/Strings.c
index 3d82b654..6158bc92 100644
--- a/bootstrap/unix-44/Strings.c
+++ b/bootstrap/unix-44/Strings.c
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.1.0 [2018/04/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/unix-44/Strings.h b/bootstrap/unix-44/Strings.h
index df6f5edc..42b68da8 100644
--- a/bootstrap/unix-44/Strings.h
+++ b/bootstrap/unix-44/Strings.h
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.1.0 [2018/04/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef Strings__h
 #define Strings__h
diff --git a/bootstrap/unix-44/Texts.c b/bootstrap/unix-44/Texts.c
index e4ee535c..6d66b07b 100644
--- a/bootstrap/unix-44/Texts.c
+++ b/bootstrap/unix-44/Texts.c
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.1.0 [2018/04/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/unix-44/Texts.h b/bootstrap/unix-44/Texts.h
index d53e287c..c706a783 100644
--- a/bootstrap/unix-44/Texts.h
+++ b/bootstrap/unix-44/Texts.h
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.1.0 [2018/04/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef Texts__h
 #define Texts__h
diff --git a/bootstrap/unix-44/VT100.c b/bootstrap/unix-44/VT100.c
index 5bfcea49..a3b0b0dd 100644
--- a/bootstrap/unix-44/VT100.c
+++ b/bootstrap/unix-44/VT100.c
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.1.0 [2018/04/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/unix-44/VT100.h b/bootstrap/unix-44/VT100.h
index 51c85058..e7539d2f 100644
--- a/bootstrap/unix-44/VT100.h
+++ b/bootstrap/unix-44/VT100.h
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.1.0 [2018/04/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef VT100__h
 #define VT100__h
diff --git a/bootstrap/unix-44/extTools.c b/bootstrap/unix-44/extTools.c
index 2b6c962b..562921ce 100644
--- a/bootstrap/unix-44/extTools.c
+++ b/bootstrap/unix-44/extTools.c
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.1.0 [2018/04/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/unix-44/extTools.h b/bootstrap/unix-44/extTools.h
index 9b0b1ee9..e6dd4577 100644
--- a/bootstrap/unix-44/extTools.h
+++ b/bootstrap/unix-44/extTools.h
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.1.0 [2018/04/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef extTools__h
 #define extTools__h
diff --git a/bootstrap/unix-48/Compiler.c b/bootstrap/unix-48/Compiler.c
index 10abd264..9cdbb76c 100644
--- a/bootstrap/unix-48/Compiler.c
+++ b/bootstrap/unix-48/Compiler.c
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. xtspamS */
+/* voc 2.1.0 [2018/04/24]. 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 8eac398d..3ab08d40 100644
--- a/bootstrap/unix-48/Configuration.c
+++ b/bootstrap/unix-48/Configuration.c
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.1.0 [2018/04/24]. 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("2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8.", Configuration_versionLong, 76);
+	__MOVE("2.1.0 [2018/04/24]. Bootstrapping compiler for address size 8, alignment 8.", Configuration_versionLong, 76);
 	__ENDMOD;
 }
diff --git a/bootstrap/unix-48/Configuration.h b/bootstrap/unix-48/Configuration.h
index c817585e..7db28b57 100644
--- a/bootstrap/unix-48/Configuration.h
+++ b/bootstrap/unix-48/Configuration.h
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.1.0 [2018/04/24]. 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 333bdb63..78f0f4e9 100644
--- a/bootstrap/unix-48/Files.c
+++ b/bootstrap/unix-48/Files.c
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. tspaSF */
+/* voc 2.1.0 [2018/04/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
@@ -154,20 +154,20 @@ static void Files_MakeFileName (CHAR *dir, ADDRESS dir__len, CHAR *name, ADDRESS
 	__DUP(name, name__len, CHAR);
 	i = 0;
 	j = 0;
-	while (dir[i] != 0x00) {
-		dest[i] = dir[i];
+	while (dir[__X(i, dir__len)] != 0x00) {
+		dest[__X(i, dest__len)] = dir[__X(i, dir__len)];
 		i += 1;
 	}
-	if (dest[i - 1] != '/') {
-		dest[i] = '/';
+	if (dest[__X(i - 1, dest__len)] != '/') {
+		dest[__X(i, dest__len)] = '/';
 		i += 1;
 	}
-	while (name[j] != 0x00) {
-		dest[i] = name[j];
+	while (name[__X(j, name__len)] != 0x00) {
+		dest[__X(i, dest__len)] = name[__X(j, name__len)];
 		i += 1;
 		j += 1;
 	}
-	dest[i] = 0x00;
+	dest[__X(i, dest__len)] = 0x00;
 	__DEL(dir);
 	__DEL(name);
 }
@@ -180,45 +180,45 @@ static void Files_GetTempName (CHAR *finalName, ADDRESS finalName__len, CHAR *na
 	n = Files_tempno;
 	i = 0;
 	if (finalName[0] != '/') {
-		while (Platform_CWD[i] != 0x00) {
-			name[i] = Platform_CWD[i];
+		while (Platform_CWD[__X(i, 256)] != 0x00) {
+			name[__X(i, name__len)] = Platform_CWD[__X(i, 256)];
 			i += 1;
 		}
-		if (Platform_CWD[i - 1] != '/') {
-			name[i] = '/';
+		if (Platform_CWD[__X(i - 1, 256)] != '/') {
+			name[__X(i, name__len)] = '/';
 			i += 1;
 		}
 	}
 	j = 0;
-	while (finalName[j] != 0x00) {
-		name[i] = finalName[j];
+	while (finalName[__X(j, finalName__len)] != 0x00) {
+		name[__X(i, name__len)] = finalName[__X(j, finalName__len)];
 		i += 1;
 		j += 1;
 	}
 	i -= 1;
-	while (name[i] != '/') {
+	while (name[__X(i, name__len)] != '/') {
 		i -= 1;
 	}
-	name[i + 1] = '.';
-	name[i + 2] = 't';
-	name[i + 3] = 'm';
-	name[i + 4] = 'p';
-	name[i + 5] = '.';
+	name[__X(i + 1, name__len)] = '.';
+	name[__X(i + 2, name__len)] = 't';
+	name[__X(i + 3, name__len)] = 'm';
+	name[__X(i + 4, name__len)] = 'p';
+	name[__X(i + 5, name__len)] = '.';
 	i += 6;
 	while (n > 0) {
-		name[i] = (CHAR)((int)__MOD(n, 10) + 48);
+		name[__X(i, name__len)] = (CHAR)((int)__MOD(n, 10) + 48);
 		n = __DIV(n, 10);
 		i += 1;
 	}
-	name[i] = '.';
+	name[__X(i, name__len)] = '.';
 	i += 1;
 	n = Platform_PID;
 	while (n > 0) {
-		name[i] = (CHAR)((int)__MOD(n, 10) + 48);
+		name[__X(i, name__len)] = (CHAR)((int)__MOD(n, 10) + 48);
 		n = __DIV(n, 10);
 		i += 1;
 	}
-	name[i] = 0x00;
+	name[__X(i, name__len)] = 0x00;
 	__DEL(finalName);
 }
 
@@ -319,8 +319,8 @@ void Files_Close (Files_File f)
 	if (f->state != 1 || f->registerName[0] != 0x00) {
 		Files_Create(f);
 		i = 0;
-		while ((i < 4 && f->bufs[i] != NIL)) {
-			Files_Flush(f->bufs[i]);
+		while ((i < 4 && f->bufs[__X(i, 4)] != NIL)) {
+			Files_Flush(f->bufs[__X(i, 4)]);
 			i += 1;
 		}
 	}
@@ -359,35 +359,35 @@ static void Files_ScanPath (INT16 *pos, CHAR *dir, ADDRESS dir__len)
 			*pos += 1;
 		}
 	} else {
-		ch = (Files_SearchPath->data)[*pos];
+		ch = (Files_SearchPath->data)[__X(*pos, Files_SearchPath->len[0])];
 		while (ch == ' ' || ch == ';') {
 			*pos += 1;
-			ch = (Files_SearchPath->data)[*pos];
+			ch = (Files_SearchPath->data)[__X(*pos, Files_SearchPath->len[0])];
 		}
 		if (ch == '~') {
 			*pos += 1;
-			ch = (Files_SearchPath->data)[*pos];
-			while (Files_HOME[i] != 0x00) {
-				dir[i] = Files_HOME[i];
+			ch = (Files_SearchPath->data)[__X(*pos, Files_SearchPath->len[0])];
+			while (Files_HOME[__X(i, 1024)] != 0x00) {
+				dir[__X(i, dir__len)] = Files_HOME[__X(i, 1024)];
 				i += 1;
 			}
 			if ((((((ch != '/' && ch != 0x00)) && ch != ';')) && ch != ' ')) {
-				while ((i > 0 && dir[i - 1] != '/')) {
+				while ((i > 0 && dir[__X(i - 1, dir__len)] != '/')) {
 					i -= 1;
 				}
 			}
 		}
 		while ((ch != 0x00 && ch != ';')) {
-			dir[i] = ch;
+			dir[__X(i, dir__len)] = ch;
 			i += 1;
 			*pos += 1;
-			ch = (Files_SearchPath->data)[*pos];
+			ch = (Files_SearchPath->data)[__X(*pos, Files_SearchPath->len[0])];
 		}
-		while ((i > 0 && dir[i - 1] == ' ')) {
+		while ((i > 0 && dir[__X(i - 1, dir__len)] == ' ')) {
 			i -= 1;
 		}
 	}
-	dir[i] = 0x00;
+	dir[__X(i, dir__len)] = 0x00;
 }
 
 static BOOLEAN Files_HasDir (CHAR *name, ADDRESS name__len)
@@ -398,7 +398,7 @@ static BOOLEAN Files_HasDir (CHAR *name, ADDRESS name__len)
 	ch = name[0];
 	while ((ch != 0x00 && ch != '/')) {
 		i += 1;
-		ch = name[i];
+		ch = name[__X(i, name__len)];
 	}
 	return ch == '/';
 }
@@ -413,9 +413,9 @@ static Files_File Files_CacheEntry (Platform_FileIdentity identity)
 			if (!Platform_SameFileTime(identity, f->identity)) {
 				i = 0;
 				while (i < 4) {
-					if (f->bufs[i] != NIL) {
-						f->bufs[i]->org = -1;
-						f->bufs[i] = NIL;
+					if (f->bufs[__X(i, 4)] != NIL) {
+						f->bufs[__X(i, 4)]->org = -1;
+						f->bufs[__X(i, 4)] = NIL;
 					}
 					i += 1;
 				}
@@ -514,9 +514,9 @@ void Files_Purge (Files_File f)
 	INT16 error;
 	i = 0;
 	while (i < 4) {
-		if (f->bufs[i] != NIL) {
-			f->bufs[i]->org = -1;
-			f->bufs[i] = NIL;
+		if (f->bufs[__X(i, 4)] != NIL) {
+			f->bufs[__X(i, 4)]->org = -1;
+			f->bufs[__X(i, 4)] = NIL;
 		}
 		i += 1;
 	}
@@ -560,22 +560,22 @@ void Files_Set (Files_Rider *r, ADDRESS *r__typ, Files_File f, INT32 pos)
 		offset = __MASK(pos, -4096);
 		org = pos - offset;
 		i = 0;
-		while ((((i < 4 && f->bufs[i] != NIL)) && org != f->bufs[i]->org)) {
+		while ((((i < 4 && f->bufs[__X(i, 4)] != NIL)) && org != f->bufs[__X(i, 4)]->org)) {
 			i += 1;
 		}
 		if (i < 4) {
-			if (f->bufs[i] == NIL) {
+			if (f->bufs[__X(i, 4)] == NIL) {
 				__NEW(buf, Files_BufDesc);
 				buf->chg = 0;
 				buf->org = -1;
 				buf->f = f;
-				f->bufs[i] = buf;
+				f->bufs[__X(i, 4)] = buf;
 			} else {
-				buf = f->bufs[i];
+				buf = f->bufs[__X(i, 4)];
 			}
 		} else {
 			f->swapper = __MASK(f->swapper + 1, -4);
-			buf = f->bufs[f->swapper];
+			buf = f->bufs[__X(f->swapper, 4)];
 			Files_Flush(buf);
 		}
 		if (buf->org != org) {
@@ -622,7 +622,7 @@ void Files_Read (Files_Rider *r, ADDRESS *r__typ, SYSTEM_BYTE *x)
 	}
 	Files_Assert(offset <= buf->size);
 	if (offset < buf->size) {
-		*x = buf->data[offset];
+		*x = buf->data[__X(offset, 4096)];
 		(*r).offset = offset + 1;
 	} else if ((*r).org + offset < buf->f->len) {
 		Files_Set(&*r, r__typ, (*r).buf->f, (*r).org + offset);
@@ -660,7 +660,7 @@ void Files_ReadBytes (Files_Rider *r, ADDRESS *r__typ, SYSTEM_BYTE *x, ADDRESS x
 		} else {
 			min = n;
 		}
-		__MOVE((ADDRESS)&buf->data[offset], (ADDRESS)&x[xpos], min);
+		__MOVE((ADDRESS)&buf->data[__X(offset, 4096)], (ADDRESS)&x[__X(xpos, x__len)], min);
 		offset += min;
 		(*r).offset = offset;
 		xpos += min;
@@ -689,7 +689,7 @@ void Files_Write (Files_Rider *r, ADDRESS *r__typ, SYSTEM_BYTE x)
 		offset = (*r).offset;
 	}
 	Files_Assert(offset < 4096);
-	buf->data[offset] = x;
+	buf->data[__X(offset, 4096)] = x;
 	buf->chg = 1;
 	if (offset == buf->size) {
 		buf->size += 1;
@@ -723,7 +723,7 @@ void Files_WriteBytes (Files_Rider *r, ADDRESS *r__typ, SYSTEM_BYTE *x, ADDRESS
 		} else {
 			min = n;
 		}
-		__MOVE((ADDRESS)&x[xpos], (ADDRESS)&buf->data[offset], min);
+		__MOVE((ADDRESS)&x[__X(xpos, x__len)], (ADDRESS)&buf->data[__X(offset, 4096)], min);
 		offset += min;
 		(*r).offset = offset;
 		Files_Assert(offset <= 4096);
@@ -843,7 +843,7 @@ static void Files_FlipBytes (SYSTEM_BYTE *src, ADDRESS src__len, SYSTEM_BYTE *de
 		j = 0;
 		while (i > 0) {
 			i -= 1;
-			dest[j] = src[i];
+			dest[__X(j, dest__len)] = src[__X(i, src__len)];
 			j += 1;
 		}
 	} else {
@@ -900,7 +900,7 @@ void Files_ReadString (Files_Rider *R, ADDRESS *R__typ, CHAR *x, ADDRESS x__len)
 	i = 0;
 	do {
 		Files_Read(&*R, R__typ, (void*)&ch);
-		x[i] = ch;
+		x[__X(i, x__len)] = ch;
 		i += 1;
 	} while (!(ch == 0x00));
 }
@@ -910,16 +910,16 @@ void Files_ReadLine (Files_Rider *R, ADDRESS *R__typ, CHAR *x, ADDRESS x__len)
 	INT16 i;
 	i = 0;
 	do {
-		Files_Read(&*R, R__typ, (void*)&x[i]);
+		Files_Read(&*R, R__typ, (void*)&x[__X(i, x__len)]);
 		i += 1;
-	} while (!(x[i - 1] == 0x00 || x[i - 1] == 0x0a));
-	if (x[i - 1] == 0x0a) {
+	} while (!(x[__X(i - 1, x__len)] == 0x00 || x[__X(i - 1, x__len)] == 0x0a));
+	if (x[__X(i - 1, x__len)] == 0x0a) {
 		i -= 1;
 	}
-	if ((i > 0 && x[i - 1] == 0x0d)) {
+	if ((i > 0 && x[__X(i - 1, x__len)] == 0x0d)) {
 		i -= 1;
 	}
-	x[i] = 0x00;
+	x[__X(i, x__len)] = 0x00;
 }
 
 void Files_ReadNum (Files_Rider *R, ADDRESS *R__typ, SYSTEM_BYTE *x, ADDRESS x__len)
@@ -992,7 +992,7 @@ void Files_WriteString (Files_Rider *R, ADDRESS *R__typ, CHAR *x, ADDRESS x__len
 {
 	INT16 i;
 	i = 0;
-	while (x[i] != 0x00) {
+	while (x[__X(i, x__len)] != 0x00) {
 		i += 1;
 	}
 	Files_WriteBytes(&*R, R__typ, (void*)x, x__len * 1, i + 1);
diff --git a/bootstrap/unix-48/Files.h b/bootstrap/unix-48/Files.h
index 8c775fa4..a0bced1c 100644
--- a/bootstrap/unix-48/Files.h
+++ b/bootstrap/unix-48/Files.h
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. tspaSF */
+/* voc 2.1.0 [2018/04/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef Files__h
 #define Files__h
diff --git a/bootstrap/unix-48/Heap.c b/bootstrap/unix-48/Heap.c
index 348b336b..bd4ed5a8 100644
--- a/bootstrap/unix-48/Heap.c
+++ b/bootstrap/unix-48/Heap.c
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. tsSF */
+/* voc 2.1.0 [2018/04/24]. Bootstrapping compiler for address size 8, alignment 8. tsSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/unix-48/Heap.h b/bootstrap/unix-48/Heap.h
index b73de4fe..8d7eb8e5 100644
--- a/bootstrap/unix-48/Heap.h
+++ b/bootstrap/unix-48/Heap.h
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. tsSF */
+/* voc 2.1.0 [2018/04/24]. 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 89f370a7..8ae1f5fb 100644
--- a/bootstrap/unix-48/Modules.c
+++ b/bootstrap/unix-48/Modules.c
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.1.0 [2018/04/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/unix-48/Modules.h b/bootstrap/unix-48/Modules.h
index 2d074a62..9d10f4ac 100644
--- a/bootstrap/unix-48/Modules.h
+++ b/bootstrap/unix-48/Modules.h
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.1.0 [2018/04/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef Modules__h
 #define Modules__h
diff --git a/bootstrap/unix-48/OPB.c b/bootstrap/unix-48/OPB.c
index 41e56e38..d7012f3e 100644
--- a/bootstrap/unix-48/OPB.c
+++ b/bootstrap/unix-48/OPB.c
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.1.0 [2018/04/24]. 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 0eba52d2..b82bf9ba 100644
--- a/bootstrap/unix-48/OPB.h
+++ b/bootstrap/unix-48/OPB.h
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.1.0 [2018/04/24]. 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 7fa9fa23..42cd3c56 100644
--- a/bootstrap/unix-48/OPC.c
+++ b/bootstrap/unix-48/OPC.c
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.1.0 [2018/04/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/unix-48/OPC.h b/bootstrap/unix-48/OPC.h
index 1e17f6c2..b79317f7 100644
--- a/bootstrap/unix-48/OPC.h
+++ b/bootstrap/unix-48/OPC.h
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.1.0 [2018/04/24]. 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 3dbed3bf..e6b33367 100644
--- a/bootstrap/unix-48/OPM.c
+++ b/bootstrap/unix-48/OPM.c
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.1.0 [2018/04/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/unix-48/OPM.h b/bootstrap/unix-48/OPM.h
index 9c84b7af..1c6ca2ac 100644
--- a/bootstrap/unix-48/OPM.h
+++ b/bootstrap/unix-48/OPM.h
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.1.0 [2018/04/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef OPM__h
 #define OPM__h
diff --git a/bootstrap/unix-48/OPP.c b/bootstrap/unix-48/OPP.c
index 00e4fa0e..54a9f7c8 100644
--- a/bootstrap/unix-48/OPP.c
+++ b/bootstrap/unix-48/OPP.c
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.1.0 [2018/04/24]. 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 010479f8..52242f7c 100644
--- a/bootstrap/unix-48/OPP.h
+++ b/bootstrap/unix-48/OPP.h
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.1.0 [2018/04/24]. 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 74719041..0e42294b 100644
--- a/bootstrap/unix-48/OPS.c
+++ b/bootstrap/unix-48/OPS.c
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. tspaSF */
+/* voc 2.1.0 [2018/04/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
@@ -56,11 +56,11 @@ static void OPS_Str (INT8 *sym)
 			OPS_err(241);
 			break;
 		}
-		OPS_str[i] = OPS_ch;
+		OPS_str[__X(i, 256)] = OPS_ch;
 		i += 1;
 	}
 	OPM_Get(&OPS_ch);
-	OPS_str[i] = 0x00;
+	OPS_str[__X(i, 256)] = 0x00;
 	OPS_intval = i + 1;
 	if (OPS_intval == 2) {
 		*sym = 35;
@@ -76,7 +76,7 @@ static void OPS_Identifier (INT8 *sym)
 	INT16 i;
 	i = 0;
 	do {
-		OPS_name[i] = OPS_ch;
+		OPS_name[__X(i, 256)] = OPS_ch;
 		i += 1;
 		OPM_Get(&OPS_ch);
 	} while (!(((OPS_ch < '0' || ('9' < OPS_ch && __CAP(OPS_ch) < 'A')) || 'Z' < __CAP(OPS_ch)) || i == 256));
@@ -84,7 +84,7 @@ static void OPS_Identifier (INT8 *sym)
 		OPS_err(240);
 		i -= 1;
 	}
-	OPS_name[i] = 0x00;
+	OPS_name[__X(i, 256)] = 0x00;
 	*sym = 38;
 }
 
@@ -143,7 +143,7 @@ static void OPS_Number (void)
 		if (('0' <= OPS_ch && OPS_ch <= '9') || (((d == 0 && 'A' <= OPS_ch)) && OPS_ch <= 'F')) {
 			if (m > 0 || OPS_ch != '0') {
 				if (n < 24) {
-					dig[n] = OPS_ch;
+					dig[__X(n, 24)] = OPS_ch;
 					n += 1;
 				}
 				m += 1;
@@ -173,7 +173,7 @@ static void OPS_Number (void)
 				OPS_numtyp = 1;
 				if (n <= 2) {
 					while (i < n) {
-						OPS_intval = __ASHL(OPS_intval, 4) + (INT64)Ord__7(dig[i], 1);
+						OPS_intval = __ASHL(OPS_intval, 4) + (INT64)Ord__7(dig[__X(i, 24)], 1);
 						i += 1;
 					}
 				} else {
@@ -187,7 +187,7 @@ static void OPS_Number (void)
 						OPS_intval = -1;
 					}
 					while (i < n) {
-						OPS_intval = __ASHL(OPS_intval, 4) + (INT64)Ord__7(dig[i], 1);
+						OPS_intval = __ASHL(OPS_intval, 4) + (INT64)Ord__7(dig[__X(i, 24)], 1);
 						i += 1;
 					}
 				} else {
@@ -196,7 +196,7 @@ static void OPS_Number (void)
 			} else {
 				OPS_numtyp = 2;
 				while (i < n) {
-					d = Ord__7(dig[i], 0);
+					d = Ord__7(dig[__X(i, 24)], 0);
 					i += 1;
 					if (OPS_intval <= __DIV(9223372036854775807LL - (INT64)d, 10)) {
 						OPS_intval = OPS_intval * 10 + (INT64)d;
@@ -214,7 +214,7 @@ static void OPS_Number (void)
 		expCh = 'E';
 		while (n > 0) {
 			n -= 1;
-			f = (Ord__7(dig[n], 0) + f) / (LONGREAL)(LONGREAL)10;
+			f = (Ord__7(dig[__X(n, 24)], 0) + f) / (LONGREAL)(LONGREAL)10;
 		}
 		if (OPS_ch == 'E' || OPS_ch == 'D') {
 			expCh = OPS_ch;
diff --git a/bootstrap/unix-48/OPS.h b/bootstrap/unix-48/OPS.h
index dfe2b972..15cdcc6c 100644
--- a/bootstrap/unix-48/OPS.h
+++ b/bootstrap/unix-48/OPS.h
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. tspaSF */
+/* voc 2.1.0 [2018/04/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef OPS__h
 #define OPS__h
diff --git a/bootstrap/unix-48/OPT.c b/bootstrap/unix-48/OPT.c
index 962b0f86..1897f024 100644
--- a/bootstrap/unix-48/OPT.c
+++ b/bootstrap/unix-48/OPT.c
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.1.0 [2018/04/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/unix-48/OPT.h b/bootstrap/unix-48/OPT.h
index f457c51e..a4688654 100644
--- a/bootstrap/unix-48/OPT.h
+++ b/bootstrap/unix-48/OPT.h
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.1.0 [2018/04/24]. 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 5193f272..ebe18cc4 100644
--- a/bootstrap/unix-48/OPV.c
+++ b/bootstrap/unix-48/OPV.c
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.1.0 [2018/04/24]. 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 bee5e44d..05e906a7 100644
--- a/bootstrap/unix-48/OPV.h
+++ b/bootstrap/unix-48/OPV.h
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.1.0 [2018/04/24]. 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 54d88edf..fc5b46c6 100644
--- a/bootstrap/unix-48/Out.c
+++ b/bootstrap/unix-48/Out.c
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.1.0 [2018/04/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/unix-48/Out.h b/bootstrap/unix-48/Out.h
index fad5cd1a..0819285a 100644
--- a/bootstrap/unix-48/Out.h
+++ b/bootstrap/unix-48/Out.h
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.1.0 [2018/04/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef Out__h
 #define Out__h
diff --git a/bootstrap/unix-48/Platform.c b/bootstrap/unix-48/Platform.c
index 86284785..b5bf3da8 100644
--- a/bootstrap/unix-48/Platform.c
+++ b/bootstrap/unix-48/Platform.c
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.1.0 [2018/04/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/unix-48/Platform.h b/bootstrap/unix-48/Platform.h
index c4f8841c..6c2d79c8 100644
--- a/bootstrap/unix-48/Platform.h
+++ b/bootstrap/unix-48/Platform.h
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.1.0 [2018/04/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef Platform__h
 #define Platform__h
diff --git a/bootstrap/unix-48/Reals.c b/bootstrap/unix-48/Reals.c
index 2af2574f..44be33b7 100644
--- a/bootstrap/unix-48/Reals.c
+++ b/bootstrap/unix-48/Reals.c
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.1.0 [2018/04/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/unix-48/Reals.h b/bootstrap/unix-48/Reals.h
index 07f4371d..7c2e0e35 100644
--- a/bootstrap/unix-48/Reals.h
+++ b/bootstrap/unix-48/Reals.h
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.1.0 [2018/04/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef Reals__h
 #define Reals__h
diff --git a/bootstrap/unix-48/Strings.c b/bootstrap/unix-48/Strings.c
index 3d82b654..6158bc92 100644
--- a/bootstrap/unix-48/Strings.c
+++ b/bootstrap/unix-48/Strings.c
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.1.0 [2018/04/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/unix-48/Strings.h b/bootstrap/unix-48/Strings.h
index df6f5edc..42b68da8 100644
--- a/bootstrap/unix-48/Strings.h
+++ b/bootstrap/unix-48/Strings.h
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.1.0 [2018/04/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef Strings__h
 #define Strings__h
diff --git a/bootstrap/unix-48/Texts.c b/bootstrap/unix-48/Texts.c
index 8e4938b8..2726593a 100644
--- a/bootstrap/unix-48/Texts.c
+++ b/bootstrap/unix-48/Texts.c
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.1.0 [2018/04/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/unix-48/Texts.h b/bootstrap/unix-48/Texts.h
index 0c55850a..714d9ac5 100644
--- a/bootstrap/unix-48/Texts.h
+++ b/bootstrap/unix-48/Texts.h
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.1.0 [2018/04/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef Texts__h
 #define Texts__h
diff --git a/bootstrap/unix-48/VT100.c b/bootstrap/unix-48/VT100.c
index 5bfcea49..a3b0b0dd 100644
--- a/bootstrap/unix-48/VT100.c
+++ b/bootstrap/unix-48/VT100.c
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.1.0 [2018/04/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/unix-48/VT100.h b/bootstrap/unix-48/VT100.h
index 51c85058..e7539d2f 100644
--- a/bootstrap/unix-48/VT100.h
+++ b/bootstrap/unix-48/VT100.h
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.1.0 [2018/04/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef VT100__h
 #define VT100__h
diff --git a/bootstrap/unix-48/extTools.c b/bootstrap/unix-48/extTools.c
index 2b6c962b..562921ce 100644
--- a/bootstrap/unix-48/extTools.c
+++ b/bootstrap/unix-48/extTools.c
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.1.0 [2018/04/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/unix-48/extTools.h b/bootstrap/unix-48/extTools.h
index 9b0b1ee9..e6dd4577 100644
--- a/bootstrap/unix-48/extTools.h
+++ b/bootstrap/unix-48/extTools.h
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.1.0 [2018/04/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef extTools__h
 #define extTools__h
diff --git a/bootstrap/unix-88/Compiler.c b/bootstrap/unix-88/Compiler.c
index 10abd264..9cdbb76c 100644
--- a/bootstrap/unix-88/Compiler.c
+++ b/bootstrap/unix-88/Compiler.c
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. xtspamS */
+/* voc 2.1.0 [2018/04/24]. 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 8eac398d..3ab08d40 100644
--- a/bootstrap/unix-88/Configuration.c
+++ b/bootstrap/unix-88/Configuration.c
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.1.0 [2018/04/24]. 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("2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8.", Configuration_versionLong, 76);
+	__MOVE("2.1.0 [2018/04/24]. Bootstrapping compiler for address size 8, alignment 8.", Configuration_versionLong, 76);
 	__ENDMOD;
 }
diff --git a/bootstrap/unix-88/Configuration.h b/bootstrap/unix-88/Configuration.h
index c817585e..7db28b57 100644
--- a/bootstrap/unix-88/Configuration.h
+++ b/bootstrap/unix-88/Configuration.h
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.1.0 [2018/04/24]. 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 4e3baead..0738e4f7 100644
--- a/bootstrap/unix-88/Files.c
+++ b/bootstrap/unix-88/Files.c
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. tspaSF */
+/* voc 2.1.0 [2018/04/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
@@ -154,20 +154,20 @@ static void Files_MakeFileName (CHAR *dir, ADDRESS dir__len, CHAR *name, ADDRESS
 	__DUP(name, name__len, CHAR);
 	i = 0;
 	j = 0;
-	while (dir[i] != 0x00) {
-		dest[i] = dir[i];
+	while (dir[__X(i, dir__len)] != 0x00) {
+		dest[__X(i, dest__len)] = dir[__X(i, dir__len)];
 		i += 1;
 	}
-	if (dest[i - 1] != '/') {
-		dest[i] = '/';
+	if (dest[__X(i - 1, dest__len)] != '/') {
+		dest[__X(i, dest__len)] = '/';
 		i += 1;
 	}
-	while (name[j] != 0x00) {
-		dest[i] = name[j];
+	while (name[__X(j, name__len)] != 0x00) {
+		dest[__X(i, dest__len)] = name[__X(j, name__len)];
 		i += 1;
 		j += 1;
 	}
-	dest[i] = 0x00;
+	dest[__X(i, dest__len)] = 0x00;
 	__DEL(dir);
 	__DEL(name);
 }
@@ -180,45 +180,45 @@ static void Files_GetTempName (CHAR *finalName, ADDRESS finalName__len, CHAR *na
 	n = Files_tempno;
 	i = 0;
 	if (finalName[0] != '/') {
-		while (Platform_CWD[i] != 0x00) {
-			name[i] = Platform_CWD[i];
+		while (Platform_CWD[__X(i, 256)] != 0x00) {
+			name[__X(i, name__len)] = Platform_CWD[__X(i, 256)];
 			i += 1;
 		}
-		if (Platform_CWD[i - 1] != '/') {
-			name[i] = '/';
+		if (Platform_CWD[__X(i - 1, 256)] != '/') {
+			name[__X(i, name__len)] = '/';
 			i += 1;
 		}
 	}
 	j = 0;
-	while (finalName[j] != 0x00) {
-		name[i] = finalName[j];
+	while (finalName[__X(j, finalName__len)] != 0x00) {
+		name[__X(i, name__len)] = finalName[__X(j, finalName__len)];
 		i += 1;
 		j += 1;
 	}
 	i -= 1;
-	while (name[i] != '/') {
+	while (name[__X(i, name__len)] != '/') {
 		i -= 1;
 	}
-	name[i + 1] = '.';
-	name[i + 2] = 't';
-	name[i + 3] = 'm';
-	name[i + 4] = 'p';
-	name[i + 5] = '.';
+	name[__X(i + 1, name__len)] = '.';
+	name[__X(i + 2, name__len)] = 't';
+	name[__X(i + 3, name__len)] = 'm';
+	name[__X(i + 4, name__len)] = 'p';
+	name[__X(i + 5, name__len)] = '.';
 	i += 6;
 	while (n > 0) {
-		name[i] = (CHAR)((int)__MOD(n, 10) + 48);
+		name[__X(i, name__len)] = (CHAR)((int)__MOD(n, 10) + 48);
 		n = __DIV(n, 10);
 		i += 1;
 	}
-	name[i] = '.';
+	name[__X(i, name__len)] = '.';
 	i += 1;
 	n = Platform_PID;
 	while (n > 0) {
-		name[i] = (CHAR)((int)__MOD(n, 10) + 48);
+		name[__X(i, name__len)] = (CHAR)((int)__MOD(n, 10) + 48);
 		n = __DIV(n, 10);
 		i += 1;
 	}
-	name[i] = 0x00;
+	name[__X(i, name__len)] = 0x00;
 	__DEL(finalName);
 }
 
@@ -319,8 +319,8 @@ void Files_Close (Files_File f)
 	if (f->state != 1 || f->registerName[0] != 0x00) {
 		Files_Create(f);
 		i = 0;
-		while ((i < 4 && f->bufs[i] != NIL)) {
-			Files_Flush(f->bufs[i]);
+		while ((i < 4 && f->bufs[__X(i, 4)] != NIL)) {
+			Files_Flush(f->bufs[__X(i, 4)]);
 			i += 1;
 		}
 	}
@@ -359,35 +359,35 @@ static void Files_ScanPath (INT16 *pos, CHAR *dir, ADDRESS dir__len)
 			*pos += 1;
 		}
 	} else {
-		ch = (Files_SearchPath->data)[*pos];
+		ch = (Files_SearchPath->data)[__X(*pos, Files_SearchPath->len[0])];
 		while (ch == ' ' || ch == ';') {
 			*pos += 1;
-			ch = (Files_SearchPath->data)[*pos];
+			ch = (Files_SearchPath->data)[__X(*pos, Files_SearchPath->len[0])];
 		}
 		if (ch == '~') {
 			*pos += 1;
-			ch = (Files_SearchPath->data)[*pos];
-			while (Files_HOME[i] != 0x00) {
-				dir[i] = Files_HOME[i];
+			ch = (Files_SearchPath->data)[__X(*pos, Files_SearchPath->len[0])];
+			while (Files_HOME[__X(i, 1024)] != 0x00) {
+				dir[__X(i, dir__len)] = Files_HOME[__X(i, 1024)];
 				i += 1;
 			}
 			if ((((((ch != '/' && ch != 0x00)) && ch != ';')) && ch != ' ')) {
-				while ((i > 0 && dir[i - 1] != '/')) {
+				while ((i > 0 && dir[__X(i - 1, dir__len)] != '/')) {
 					i -= 1;
 				}
 			}
 		}
 		while ((ch != 0x00 && ch != ';')) {
-			dir[i] = ch;
+			dir[__X(i, dir__len)] = ch;
 			i += 1;
 			*pos += 1;
-			ch = (Files_SearchPath->data)[*pos];
+			ch = (Files_SearchPath->data)[__X(*pos, Files_SearchPath->len[0])];
 		}
-		while ((i > 0 && dir[i - 1] == ' ')) {
+		while ((i > 0 && dir[__X(i - 1, dir__len)] == ' ')) {
 			i -= 1;
 		}
 	}
-	dir[i] = 0x00;
+	dir[__X(i, dir__len)] = 0x00;
 }
 
 static BOOLEAN Files_HasDir (CHAR *name, ADDRESS name__len)
@@ -398,7 +398,7 @@ static BOOLEAN Files_HasDir (CHAR *name, ADDRESS name__len)
 	ch = name[0];
 	while ((ch != 0x00 && ch != '/')) {
 		i += 1;
-		ch = name[i];
+		ch = name[__X(i, name__len)];
 	}
 	return ch == '/';
 }
@@ -413,9 +413,9 @@ static Files_File Files_CacheEntry (Platform_FileIdentity identity)
 			if (!Platform_SameFileTime(identity, f->identity)) {
 				i = 0;
 				while (i < 4) {
-					if (f->bufs[i] != NIL) {
-						f->bufs[i]->org = -1;
-						f->bufs[i] = NIL;
+					if (f->bufs[__X(i, 4)] != NIL) {
+						f->bufs[__X(i, 4)]->org = -1;
+						f->bufs[__X(i, 4)] = NIL;
 					}
 					i += 1;
 				}
@@ -514,9 +514,9 @@ void Files_Purge (Files_File f)
 	INT16 error;
 	i = 0;
 	while (i < 4) {
-		if (f->bufs[i] != NIL) {
-			f->bufs[i]->org = -1;
-			f->bufs[i] = NIL;
+		if (f->bufs[__X(i, 4)] != NIL) {
+			f->bufs[__X(i, 4)]->org = -1;
+			f->bufs[__X(i, 4)] = NIL;
 		}
 		i += 1;
 	}
@@ -560,22 +560,22 @@ void Files_Set (Files_Rider *r, ADDRESS *r__typ, Files_File f, INT32 pos)
 		offset = __MASK(pos, -4096);
 		org = pos - offset;
 		i = 0;
-		while ((((i < 4 && f->bufs[i] != NIL)) && org != f->bufs[i]->org)) {
+		while ((((i < 4 && f->bufs[__X(i, 4)] != NIL)) && org != f->bufs[__X(i, 4)]->org)) {
 			i += 1;
 		}
 		if (i < 4) {
-			if (f->bufs[i] == NIL) {
+			if (f->bufs[__X(i, 4)] == NIL) {
 				__NEW(buf, Files_BufDesc);
 				buf->chg = 0;
 				buf->org = -1;
 				buf->f = f;
-				f->bufs[i] = buf;
+				f->bufs[__X(i, 4)] = buf;
 			} else {
-				buf = f->bufs[i];
+				buf = f->bufs[__X(i, 4)];
 			}
 		} else {
 			f->swapper = __MASK(f->swapper + 1, -4);
-			buf = f->bufs[f->swapper];
+			buf = f->bufs[__X(f->swapper, 4)];
 			Files_Flush(buf);
 		}
 		if (buf->org != org) {
@@ -622,7 +622,7 @@ void Files_Read (Files_Rider *r, ADDRESS *r__typ, SYSTEM_BYTE *x)
 	}
 	Files_Assert(offset <= buf->size);
 	if (offset < buf->size) {
-		*x = buf->data[offset];
+		*x = buf->data[__X(offset, 4096)];
 		(*r).offset = offset + 1;
 	} else if ((*r).org + offset < buf->f->len) {
 		Files_Set(&*r, r__typ, (*r).buf->f, (*r).org + offset);
@@ -660,7 +660,7 @@ void Files_ReadBytes (Files_Rider *r, ADDRESS *r__typ, SYSTEM_BYTE *x, ADDRESS x
 		} else {
 			min = n;
 		}
-		__MOVE((ADDRESS)&buf->data[offset], (ADDRESS)&x[xpos], min);
+		__MOVE((ADDRESS)&buf->data[__X(offset, 4096)], (ADDRESS)&x[__X(xpos, x__len)], min);
 		offset += min;
 		(*r).offset = offset;
 		xpos += min;
@@ -689,7 +689,7 @@ void Files_Write (Files_Rider *r, ADDRESS *r__typ, SYSTEM_BYTE x)
 		offset = (*r).offset;
 	}
 	Files_Assert(offset < 4096);
-	buf->data[offset] = x;
+	buf->data[__X(offset, 4096)] = x;
 	buf->chg = 1;
 	if (offset == buf->size) {
 		buf->size += 1;
@@ -723,7 +723,7 @@ void Files_WriteBytes (Files_Rider *r, ADDRESS *r__typ, SYSTEM_BYTE *x, ADDRESS
 		} else {
 			min = n;
 		}
-		__MOVE((ADDRESS)&x[xpos], (ADDRESS)&buf->data[offset], min);
+		__MOVE((ADDRESS)&x[__X(xpos, x__len)], (ADDRESS)&buf->data[__X(offset, 4096)], min);
 		offset += min;
 		(*r).offset = offset;
 		Files_Assert(offset <= 4096);
@@ -843,7 +843,7 @@ static void Files_FlipBytes (SYSTEM_BYTE *src, ADDRESS src__len, SYSTEM_BYTE *de
 		j = 0;
 		while (i > 0) {
 			i -= 1;
-			dest[j] = src[i];
+			dest[__X(j, dest__len)] = src[__X(i, src__len)];
 			j += 1;
 		}
 	} else {
@@ -900,7 +900,7 @@ void Files_ReadString (Files_Rider *R, ADDRESS *R__typ, CHAR *x, ADDRESS x__len)
 	i = 0;
 	do {
 		Files_Read(&*R, R__typ, (void*)&ch);
-		x[i] = ch;
+		x[__X(i, x__len)] = ch;
 		i += 1;
 	} while (!(ch == 0x00));
 }
@@ -910,16 +910,16 @@ void Files_ReadLine (Files_Rider *R, ADDRESS *R__typ, CHAR *x, ADDRESS x__len)
 	INT16 i;
 	i = 0;
 	do {
-		Files_Read(&*R, R__typ, (void*)&x[i]);
+		Files_Read(&*R, R__typ, (void*)&x[__X(i, x__len)]);
 		i += 1;
-	} while (!(x[i - 1] == 0x00 || x[i - 1] == 0x0a));
-	if (x[i - 1] == 0x0a) {
+	} while (!(x[__X(i - 1, x__len)] == 0x00 || x[__X(i - 1, x__len)] == 0x0a));
+	if (x[__X(i - 1, x__len)] == 0x0a) {
 		i -= 1;
 	}
-	if ((i > 0 && x[i - 1] == 0x0d)) {
+	if ((i > 0 && x[__X(i - 1, x__len)] == 0x0d)) {
 		i -= 1;
 	}
-	x[i] = 0x00;
+	x[__X(i, x__len)] = 0x00;
 }
 
 void Files_ReadNum (Files_Rider *R, ADDRESS *R__typ, SYSTEM_BYTE *x, ADDRESS x__len)
@@ -992,7 +992,7 @@ void Files_WriteString (Files_Rider *R, ADDRESS *R__typ, CHAR *x, ADDRESS x__len
 {
 	INT16 i;
 	i = 0;
-	while (x[i] != 0x00) {
+	while (x[__X(i, x__len)] != 0x00) {
 		i += 1;
 	}
 	Files_WriteBytes(&*R, R__typ, (void*)x, x__len * 1, i + 1);
diff --git a/bootstrap/unix-88/Files.h b/bootstrap/unix-88/Files.h
index b0056ea8..9d81c004 100644
--- a/bootstrap/unix-88/Files.h
+++ b/bootstrap/unix-88/Files.h
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. tspaSF */
+/* voc 2.1.0 [2018/04/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef Files__h
 #define Files__h
diff --git a/bootstrap/unix-88/Heap.c b/bootstrap/unix-88/Heap.c
index 9e99e657..eb19a612 100644
--- a/bootstrap/unix-88/Heap.c
+++ b/bootstrap/unix-88/Heap.c
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. tsSF */
+/* voc 2.1.0 [2018/04/24]. Bootstrapping compiler for address size 8, alignment 8. tsSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/unix-88/Heap.h b/bootstrap/unix-88/Heap.h
index 2b6287cd..ab574eed 100644
--- a/bootstrap/unix-88/Heap.h
+++ b/bootstrap/unix-88/Heap.h
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. tsSF */
+/* voc 2.1.0 [2018/04/24]. 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 25d5f032..3c88874e 100644
--- a/bootstrap/unix-88/Modules.c
+++ b/bootstrap/unix-88/Modules.c
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.1.0 [2018/04/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/unix-88/Modules.h b/bootstrap/unix-88/Modules.h
index 5d832fa6..3f97dc19 100644
--- a/bootstrap/unix-88/Modules.h
+++ b/bootstrap/unix-88/Modules.h
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.1.0 [2018/04/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef Modules__h
 #define Modules__h
diff --git a/bootstrap/unix-88/OPB.c b/bootstrap/unix-88/OPB.c
index 41e56e38..d7012f3e 100644
--- a/bootstrap/unix-88/OPB.c
+++ b/bootstrap/unix-88/OPB.c
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.1.0 [2018/04/24]. 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 0eba52d2..b82bf9ba 100644
--- a/bootstrap/unix-88/OPB.h
+++ b/bootstrap/unix-88/OPB.h
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.1.0 [2018/04/24]. 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 7fa9fa23..42cd3c56 100644
--- a/bootstrap/unix-88/OPC.c
+++ b/bootstrap/unix-88/OPC.c
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.1.0 [2018/04/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/unix-88/OPC.h b/bootstrap/unix-88/OPC.h
index 1e17f6c2..b79317f7 100644
--- a/bootstrap/unix-88/OPC.h
+++ b/bootstrap/unix-88/OPC.h
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.1.0 [2018/04/24]. 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 bcf72c6b..28e1ec4b 100644
--- a/bootstrap/unix-88/OPM.c
+++ b/bootstrap/unix-88/OPM.c
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.1.0 [2018/04/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/unix-88/OPM.h b/bootstrap/unix-88/OPM.h
index 9c84b7af..1c6ca2ac 100644
--- a/bootstrap/unix-88/OPM.h
+++ b/bootstrap/unix-88/OPM.h
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.1.0 [2018/04/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef OPM__h
 #define OPM__h
diff --git a/bootstrap/unix-88/OPP.c b/bootstrap/unix-88/OPP.c
index 18305e4c..7508ac7a 100644
--- a/bootstrap/unix-88/OPP.c
+++ b/bootstrap/unix-88/OPP.c
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.1.0 [2018/04/24]. 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 010479f8..52242f7c 100644
--- a/bootstrap/unix-88/OPP.h
+++ b/bootstrap/unix-88/OPP.h
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.1.0 [2018/04/24]. 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 74719041..0e42294b 100644
--- a/bootstrap/unix-88/OPS.c
+++ b/bootstrap/unix-88/OPS.c
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. tspaSF */
+/* voc 2.1.0 [2018/04/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
@@ -56,11 +56,11 @@ static void OPS_Str (INT8 *sym)
 			OPS_err(241);
 			break;
 		}
-		OPS_str[i] = OPS_ch;
+		OPS_str[__X(i, 256)] = OPS_ch;
 		i += 1;
 	}
 	OPM_Get(&OPS_ch);
-	OPS_str[i] = 0x00;
+	OPS_str[__X(i, 256)] = 0x00;
 	OPS_intval = i + 1;
 	if (OPS_intval == 2) {
 		*sym = 35;
@@ -76,7 +76,7 @@ static void OPS_Identifier (INT8 *sym)
 	INT16 i;
 	i = 0;
 	do {
-		OPS_name[i] = OPS_ch;
+		OPS_name[__X(i, 256)] = OPS_ch;
 		i += 1;
 		OPM_Get(&OPS_ch);
 	} while (!(((OPS_ch < '0' || ('9' < OPS_ch && __CAP(OPS_ch) < 'A')) || 'Z' < __CAP(OPS_ch)) || i == 256));
@@ -84,7 +84,7 @@ static void OPS_Identifier (INT8 *sym)
 		OPS_err(240);
 		i -= 1;
 	}
-	OPS_name[i] = 0x00;
+	OPS_name[__X(i, 256)] = 0x00;
 	*sym = 38;
 }
 
@@ -143,7 +143,7 @@ static void OPS_Number (void)
 		if (('0' <= OPS_ch && OPS_ch <= '9') || (((d == 0 && 'A' <= OPS_ch)) && OPS_ch <= 'F')) {
 			if (m > 0 || OPS_ch != '0') {
 				if (n < 24) {
-					dig[n] = OPS_ch;
+					dig[__X(n, 24)] = OPS_ch;
 					n += 1;
 				}
 				m += 1;
@@ -173,7 +173,7 @@ static void OPS_Number (void)
 				OPS_numtyp = 1;
 				if (n <= 2) {
 					while (i < n) {
-						OPS_intval = __ASHL(OPS_intval, 4) + (INT64)Ord__7(dig[i], 1);
+						OPS_intval = __ASHL(OPS_intval, 4) + (INT64)Ord__7(dig[__X(i, 24)], 1);
 						i += 1;
 					}
 				} else {
@@ -187,7 +187,7 @@ static void OPS_Number (void)
 						OPS_intval = -1;
 					}
 					while (i < n) {
-						OPS_intval = __ASHL(OPS_intval, 4) + (INT64)Ord__7(dig[i], 1);
+						OPS_intval = __ASHL(OPS_intval, 4) + (INT64)Ord__7(dig[__X(i, 24)], 1);
 						i += 1;
 					}
 				} else {
@@ -196,7 +196,7 @@ static void OPS_Number (void)
 			} else {
 				OPS_numtyp = 2;
 				while (i < n) {
-					d = Ord__7(dig[i], 0);
+					d = Ord__7(dig[__X(i, 24)], 0);
 					i += 1;
 					if (OPS_intval <= __DIV(9223372036854775807LL - (INT64)d, 10)) {
 						OPS_intval = OPS_intval * 10 + (INT64)d;
@@ -214,7 +214,7 @@ static void OPS_Number (void)
 		expCh = 'E';
 		while (n > 0) {
 			n -= 1;
-			f = (Ord__7(dig[n], 0) + f) / (LONGREAL)(LONGREAL)10;
+			f = (Ord__7(dig[__X(n, 24)], 0) + f) / (LONGREAL)(LONGREAL)10;
 		}
 		if (OPS_ch == 'E' || OPS_ch == 'D') {
 			expCh = OPS_ch;
diff --git a/bootstrap/unix-88/OPS.h b/bootstrap/unix-88/OPS.h
index dfe2b972..15cdcc6c 100644
--- a/bootstrap/unix-88/OPS.h
+++ b/bootstrap/unix-88/OPS.h
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. tspaSF */
+/* voc 2.1.0 [2018/04/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef OPS__h
 #define OPS__h
diff --git a/bootstrap/unix-88/OPT.c b/bootstrap/unix-88/OPT.c
index c6989580..57dfaa59 100644
--- a/bootstrap/unix-88/OPT.c
+++ b/bootstrap/unix-88/OPT.c
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.1.0 [2018/04/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/unix-88/OPT.h b/bootstrap/unix-88/OPT.h
index f457c51e..a4688654 100644
--- a/bootstrap/unix-88/OPT.h
+++ b/bootstrap/unix-88/OPT.h
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.1.0 [2018/04/24]. 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 617e9e58..bad459b6 100644
--- a/bootstrap/unix-88/OPV.c
+++ b/bootstrap/unix-88/OPV.c
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.1.0 [2018/04/24]. 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 bee5e44d..05e906a7 100644
--- a/bootstrap/unix-88/OPV.h
+++ b/bootstrap/unix-88/OPV.h
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.1.0 [2018/04/24]. 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 54d88edf..fc5b46c6 100644
--- a/bootstrap/unix-88/Out.c
+++ b/bootstrap/unix-88/Out.c
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.1.0 [2018/04/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/unix-88/Out.h b/bootstrap/unix-88/Out.h
index fad5cd1a..0819285a 100644
--- a/bootstrap/unix-88/Out.h
+++ b/bootstrap/unix-88/Out.h
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.1.0 [2018/04/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef Out__h
 #define Out__h
diff --git a/bootstrap/unix-88/Platform.c b/bootstrap/unix-88/Platform.c
index bb97464a..fa174db0 100644
--- a/bootstrap/unix-88/Platform.c
+++ b/bootstrap/unix-88/Platform.c
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.1.0 [2018/04/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/unix-88/Platform.h b/bootstrap/unix-88/Platform.h
index 51911cc6..085c2257 100644
--- a/bootstrap/unix-88/Platform.h
+++ b/bootstrap/unix-88/Platform.h
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.1.0 [2018/04/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef Platform__h
 #define Platform__h
diff --git a/bootstrap/unix-88/Reals.c b/bootstrap/unix-88/Reals.c
index 2af2574f..44be33b7 100644
--- a/bootstrap/unix-88/Reals.c
+++ b/bootstrap/unix-88/Reals.c
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.1.0 [2018/04/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/unix-88/Reals.h b/bootstrap/unix-88/Reals.h
index 07f4371d..7c2e0e35 100644
--- a/bootstrap/unix-88/Reals.h
+++ b/bootstrap/unix-88/Reals.h
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.1.0 [2018/04/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef Reals__h
 #define Reals__h
diff --git a/bootstrap/unix-88/Strings.c b/bootstrap/unix-88/Strings.c
index 3d82b654..6158bc92 100644
--- a/bootstrap/unix-88/Strings.c
+++ b/bootstrap/unix-88/Strings.c
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.1.0 [2018/04/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/unix-88/Strings.h b/bootstrap/unix-88/Strings.h
index df6f5edc..42b68da8 100644
--- a/bootstrap/unix-88/Strings.h
+++ b/bootstrap/unix-88/Strings.h
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.1.0 [2018/04/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef Strings__h
 #define Strings__h
diff --git a/bootstrap/unix-88/Texts.c b/bootstrap/unix-88/Texts.c
index 82588563..6a06c85c 100644
--- a/bootstrap/unix-88/Texts.c
+++ b/bootstrap/unix-88/Texts.c
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.1.0 [2018/04/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/unix-88/Texts.h b/bootstrap/unix-88/Texts.h
index b3dd50cb..e4aa3a7d 100644
--- a/bootstrap/unix-88/Texts.h
+++ b/bootstrap/unix-88/Texts.h
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.1.0 [2018/04/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef Texts__h
 #define Texts__h
diff --git a/bootstrap/unix-88/VT100.c b/bootstrap/unix-88/VT100.c
index 5bfcea49..a3b0b0dd 100644
--- a/bootstrap/unix-88/VT100.c
+++ b/bootstrap/unix-88/VT100.c
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.1.0 [2018/04/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/unix-88/VT100.h b/bootstrap/unix-88/VT100.h
index 51c85058..e7539d2f 100644
--- a/bootstrap/unix-88/VT100.h
+++ b/bootstrap/unix-88/VT100.h
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.1.0 [2018/04/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef VT100__h
 #define VT100__h
diff --git a/bootstrap/unix-88/extTools.c b/bootstrap/unix-88/extTools.c
index 2b6c962b..562921ce 100644
--- a/bootstrap/unix-88/extTools.c
+++ b/bootstrap/unix-88/extTools.c
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.1.0 [2018/04/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/unix-88/extTools.h b/bootstrap/unix-88/extTools.h
index 9b0b1ee9..e6dd4577 100644
--- a/bootstrap/unix-88/extTools.h
+++ b/bootstrap/unix-88/extTools.h
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.1.0 [2018/04/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef extTools__h
 #define extTools__h
diff --git a/bootstrap/windows-48/Compiler.c b/bootstrap/windows-48/Compiler.c
index 10abd264..9cdbb76c 100644
--- a/bootstrap/windows-48/Compiler.c
+++ b/bootstrap/windows-48/Compiler.c
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. xtspamS */
+/* voc 2.1.0 [2018/04/24]. 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 8eac398d..3ab08d40 100644
--- a/bootstrap/windows-48/Configuration.c
+++ b/bootstrap/windows-48/Configuration.c
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.1.0 [2018/04/24]. 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("2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8.", Configuration_versionLong, 76);
+	__MOVE("2.1.0 [2018/04/24]. Bootstrapping compiler for address size 8, alignment 8.", Configuration_versionLong, 76);
 	__ENDMOD;
 }
diff --git a/bootstrap/windows-48/Configuration.h b/bootstrap/windows-48/Configuration.h
index c817585e..7db28b57 100644
--- a/bootstrap/windows-48/Configuration.h
+++ b/bootstrap/windows-48/Configuration.h
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.1.0 [2018/04/24]. 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 15471c4f..e714f199 100644
--- a/bootstrap/windows-48/Files.c
+++ b/bootstrap/windows-48/Files.c
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. tspaSF */
+/* voc 2.1.0 [2018/04/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
@@ -154,20 +154,20 @@ static void Files_MakeFileName (CHAR *dir, ADDRESS dir__len, CHAR *name, ADDRESS
 	__DUP(name, name__len, CHAR);
 	i = 0;
 	j = 0;
-	while (dir[i] != 0x00) {
-		dest[i] = dir[i];
+	while (dir[__X(i, dir__len)] != 0x00) {
+		dest[__X(i, dest__len)] = dir[__X(i, dir__len)];
 		i += 1;
 	}
-	if (dest[i - 1] != '/') {
-		dest[i] = '/';
+	if (dest[__X(i - 1, dest__len)] != '/') {
+		dest[__X(i, dest__len)] = '/';
 		i += 1;
 	}
-	while (name[j] != 0x00) {
-		dest[i] = name[j];
+	while (name[__X(j, name__len)] != 0x00) {
+		dest[__X(i, dest__len)] = name[__X(j, name__len)];
 		i += 1;
 		j += 1;
 	}
-	dest[i] = 0x00;
+	dest[__X(i, dest__len)] = 0x00;
 	__DEL(dir);
 	__DEL(name);
 }
@@ -180,45 +180,45 @@ static void Files_GetTempName (CHAR *finalName, ADDRESS finalName__len, CHAR *na
 	n = Files_tempno;
 	i = 0;
 	if (finalName[0] != '/') {
-		while (Platform_CWD[i] != 0x00) {
-			name[i] = Platform_CWD[i];
+		while (Platform_CWD[__X(i, 4096)] != 0x00) {
+			name[__X(i, name__len)] = Platform_CWD[__X(i, 4096)];
 			i += 1;
 		}
-		if (Platform_CWD[i - 1] != '/') {
-			name[i] = '/';
+		if (Platform_CWD[__X(i - 1, 4096)] != '/') {
+			name[__X(i, name__len)] = '/';
 			i += 1;
 		}
 	}
 	j = 0;
-	while (finalName[j] != 0x00) {
-		name[i] = finalName[j];
+	while (finalName[__X(j, finalName__len)] != 0x00) {
+		name[__X(i, name__len)] = finalName[__X(j, finalName__len)];
 		i += 1;
 		j += 1;
 	}
 	i -= 1;
-	while (name[i] != '/') {
+	while (name[__X(i, name__len)] != '/') {
 		i -= 1;
 	}
-	name[i + 1] = '.';
-	name[i + 2] = 't';
-	name[i + 3] = 'm';
-	name[i + 4] = 'p';
-	name[i + 5] = '.';
+	name[__X(i + 1, name__len)] = '.';
+	name[__X(i + 2, name__len)] = 't';
+	name[__X(i + 3, name__len)] = 'm';
+	name[__X(i + 4, name__len)] = 'p';
+	name[__X(i + 5, name__len)] = '.';
 	i += 6;
 	while (n > 0) {
-		name[i] = (CHAR)((int)__MOD(n, 10) + 48);
+		name[__X(i, name__len)] = (CHAR)((int)__MOD(n, 10) + 48);
 		n = __DIV(n, 10);
 		i += 1;
 	}
-	name[i] = '.';
+	name[__X(i, name__len)] = '.';
 	i += 1;
 	n = Platform_PID;
 	while (n > 0) {
-		name[i] = (CHAR)((int)__MOD(n, 10) + 48);
+		name[__X(i, name__len)] = (CHAR)((int)__MOD(n, 10) + 48);
 		n = __DIV(n, 10);
 		i += 1;
 	}
-	name[i] = 0x00;
+	name[__X(i, name__len)] = 0x00;
 	__DEL(finalName);
 }
 
@@ -319,8 +319,8 @@ void Files_Close (Files_File f)
 	if (f->state != 1 || f->registerName[0] != 0x00) {
 		Files_Create(f);
 		i = 0;
-		while ((i < 4 && f->bufs[i] != NIL)) {
-			Files_Flush(f->bufs[i]);
+		while ((i < 4 && f->bufs[__X(i, 4)] != NIL)) {
+			Files_Flush(f->bufs[__X(i, 4)]);
 			i += 1;
 		}
 	}
@@ -359,35 +359,35 @@ static void Files_ScanPath (INT16 *pos, CHAR *dir, ADDRESS dir__len)
 			*pos += 1;
 		}
 	} else {
-		ch = (Files_SearchPath->data)[*pos];
+		ch = (Files_SearchPath->data)[__X(*pos, Files_SearchPath->len[0])];
 		while (ch == ' ' || ch == ';') {
 			*pos += 1;
-			ch = (Files_SearchPath->data)[*pos];
+			ch = (Files_SearchPath->data)[__X(*pos, Files_SearchPath->len[0])];
 		}
 		if (ch == '~') {
 			*pos += 1;
-			ch = (Files_SearchPath->data)[*pos];
-			while (Files_HOME[i] != 0x00) {
-				dir[i] = Files_HOME[i];
+			ch = (Files_SearchPath->data)[__X(*pos, Files_SearchPath->len[0])];
+			while (Files_HOME[__X(i, 1024)] != 0x00) {
+				dir[__X(i, dir__len)] = Files_HOME[__X(i, 1024)];
 				i += 1;
 			}
 			if ((((((ch != '/' && ch != 0x00)) && ch != ';')) && ch != ' ')) {
-				while ((i > 0 && dir[i - 1] != '/')) {
+				while ((i > 0 && dir[__X(i - 1, dir__len)] != '/')) {
 					i -= 1;
 				}
 			}
 		}
 		while ((ch != 0x00 && ch != ';')) {
-			dir[i] = ch;
+			dir[__X(i, dir__len)] = ch;
 			i += 1;
 			*pos += 1;
-			ch = (Files_SearchPath->data)[*pos];
+			ch = (Files_SearchPath->data)[__X(*pos, Files_SearchPath->len[0])];
 		}
-		while ((i > 0 && dir[i - 1] == ' ')) {
+		while ((i > 0 && dir[__X(i - 1, dir__len)] == ' ')) {
 			i -= 1;
 		}
 	}
-	dir[i] = 0x00;
+	dir[__X(i, dir__len)] = 0x00;
 }
 
 static BOOLEAN Files_HasDir (CHAR *name, ADDRESS name__len)
@@ -398,7 +398,7 @@ static BOOLEAN Files_HasDir (CHAR *name, ADDRESS name__len)
 	ch = name[0];
 	while ((ch != 0x00 && ch != '/')) {
 		i += 1;
-		ch = name[i];
+		ch = name[__X(i, name__len)];
 	}
 	return ch == '/';
 }
@@ -413,9 +413,9 @@ static Files_File Files_CacheEntry (Platform_FileIdentity identity)
 			if (!Platform_SameFileTime(identity, f->identity)) {
 				i = 0;
 				while (i < 4) {
-					if (f->bufs[i] != NIL) {
-						f->bufs[i]->org = -1;
-						f->bufs[i] = NIL;
+					if (f->bufs[__X(i, 4)] != NIL) {
+						f->bufs[__X(i, 4)]->org = -1;
+						f->bufs[__X(i, 4)] = NIL;
 					}
 					i += 1;
 				}
@@ -514,9 +514,9 @@ void Files_Purge (Files_File f)
 	INT16 error;
 	i = 0;
 	while (i < 4) {
-		if (f->bufs[i] != NIL) {
-			f->bufs[i]->org = -1;
-			f->bufs[i] = NIL;
+		if (f->bufs[__X(i, 4)] != NIL) {
+			f->bufs[__X(i, 4)]->org = -1;
+			f->bufs[__X(i, 4)] = NIL;
 		}
 		i += 1;
 	}
@@ -560,22 +560,22 @@ void Files_Set (Files_Rider *r, ADDRESS *r__typ, Files_File f, INT32 pos)
 		offset = __MASK(pos, -4096);
 		org = pos - offset;
 		i = 0;
-		while ((((i < 4 && f->bufs[i] != NIL)) && org != f->bufs[i]->org)) {
+		while ((((i < 4 && f->bufs[__X(i, 4)] != NIL)) && org != f->bufs[__X(i, 4)]->org)) {
 			i += 1;
 		}
 		if (i < 4) {
-			if (f->bufs[i] == NIL) {
+			if (f->bufs[__X(i, 4)] == NIL) {
 				__NEW(buf, Files_BufDesc);
 				buf->chg = 0;
 				buf->org = -1;
 				buf->f = f;
-				f->bufs[i] = buf;
+				f->bufs[__X(i, 4)] = buf;
 			} else {
-				buf = f->bufs[i];
+				buf = f->bufs[__X(i, 4)];
 			}
 		} else {
 			f->swapper = __MASK(f->swapper + 1, -4);
-			buf = f->bufs[f->swapper];
+			buf = f->bufs[__X(f->swapper, 4)];
 			Files_Flush(buf);
 		}
 		if (buf->org != org) {
@@ -622,7 +622,7 @@ void Files_Read (Files_Rider *r, ADDRESS *r__typ, SYSTEM_BYTE *x)
 	}
 	Files_Assert(offset <= buf->size);
 	if (offset < buf->size) {
-		*x = buf->data[offset];
+		*x = buf->data[__X(offset, 4096)];
 		(*r).offset = offset + 1;
 	} else if ((*r).org + offset < buf->f->len) {
 		Files_Set(&*r, r__typ, (*r).buf->f, (*r).org + offset);
@@ -660,7 +660,7 @@ void Files_ReadBytes (Files_Rider *r, ADDRESS *r__typ, SYSTEM_BYTE *x, ADDRESS x
 		} else {
 			min = n;
 		}
-		__MOVE((ADDRESS)&buf->data[offset], (ADDRESS)&x[xpos], min);
+		__MOVE((ADDRESS)&buf->data[__X(offset, 4096)], (ADDRESS)&x[__X(xpos, x__len)], min);
 		offset += min;
 		(*r).offset = offset;
 		xpos += min;
@@ -689,7 +689,7 @@ void Files_Write (Files_Rider *r, ADDRESS *r__typ, SYSTEM_BYTE x)
 		offset = (*r).offset;
 	}
 	Files_Assert(offset < 4096);
-	buf->data[offset] = x;
+	buf->data[__X(offset, 4096)] = x;
 	buf->chg = 1;
 	if (offset == buf->size) {
 		buf->size += 1;
@@ -723,7 +723,7 @@ void Files_WriteBytes (Files_Rider *r, ADDRESS *r__typ, SYSTEM_BYTE *x, ADDRESS
 		} else {
 			min = n;
 		}
-		__MOVE((ADDRESS)&x[xpos], (ADDRESS)&buf->data[offset], min);
+		__MOVE((ADDRESS)&x[__X(xpos, x__len)], (ADDRESS)&buf->data[__X(offset, 4096)], min);
 		offset += min;
 		(*r).offset = offset;
 		Files_Assert(offset <= 4096);
@@ -843,7 +843,7 @@ static void Files_FlipBytes (SYSTEM_BYTE *src, ADDRESS src__len, SYSTEM_BYTE *de
 		j = 0;
 		while (i > 0) {
 			i -= 1;
-			dest[j] = src[i];
+			dest[__X(j, dest__len)] = src[__X(i, src__len)];
 			j += 1;
 		}
 	} else {
@@ -900,7 +900,7 @@ void Files_ReadString (Files_Rider *R, ADDRESS *R__typ, CHAR *x, ADDRESS x__len)
 	i = 0;
 	do {
 		Files_Read(&*R, R__typ, (void*)&ch);
-		x[i] = ch;
+		x[__X(i, x__len)] = ch;
 		i += 1;
 	} while (!(ch == 0x00));
 }
@@ -910,16 +910,16 @@ void Files_ReadLine (Files_Rider *R, ADDRESS *R__typ, CHAR *x, ADDRESS x__len)
 	INT16 i;
 	i = 0;
 	do {
-		Files_Read(&*R, R__typ, (void*)&x[i]);
+		Files_Read(&*R, R__typ, (void*)&x[__X(i, x__len)]);
 		i += 1;
-	} while (!(x[i - 1] == 0x00 || x[i - 1] == 0x0a));
-	if (x[i - 1] == 0x0a) {
+	} while (!(x[__X(i - 1, x__len)] == 0x00 || x[__X(i - 1, x__len)] == 0x0a));
+	if (x[__X(i - 1, x__len)] == 0x0a) {
 		i -= 1;
 	}
-	if ((i > 0 && x[i - 1] == 0x0d)) {
+	if ((i > 0 && x[__X(i - 1, x__len)] == 0x0d)) {
 		i -= 1;
 	}
-	x[i] = 0x00;
+	x[__X(i, x__len)] = 0x00;
 }
 
 void Files_ReadNum (Files_Rider *R, ADDRESS *R__typ, SYSTEM_BYTE *x, ADDRESS x__len)
@@ -992,7 +992,7 @@ void Files_WriteString (Files_Rider *R, ADDRESS *R__typ, CHAR *x, ADDRESS x__len
 {
 	INT16 i;
 	i = 0;
-	while (x[i] != 0x00) {
+	while (x[__X(i, x__len)] != 0x00) {
 		i += 1;
 	}
 	Files_WriteBytes(&*R, R__typ, (void*)x, x__len * 1, i + 1);
diff --git a/bootstrap/windows-48/Files.h b/bootstrap/windows-48/Files.h
index 25b5a32d..61cad689 100644
--- a/bootstrap/windows-48/Files.h
+++ b/bootstrap/windows-48/Files.h
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. tspaSF */
+/* voc 2.1.0 [2018/04/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef Files__h
 #define Files__h
diff --git a/bootstrap/windows-48/Heap.c b/bootstrap/windows-48/Heap.c
index 348b336b..bd4ed5a8 100644
--- a/bootstrap/windows-48/Heap.c
+++ b/bootstrap/windows-48/Heap.c
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. tsSF */
+/* voc 2.1.0 [2018/04/24]. Bootstrapping compiler for address size 8, alignment 8. tsSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/windows-48/Heap.h b/bootstrap/windows-48/Heap.h
index b73de4fe..8d7eb8e5 100644
--- a/bootstrap/windows-48/Heap.h
+++ b/bootstrap/windows-48/Heap.h
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. tsSF */
+/* voc 2.1.0 [2018/04/24]. 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 e2075ab0..276b9857 100644
--- a/bootstrap/windows-48/Modules.c
+++ b/bootstrap/windows-48/Modules.c
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.1.0 [2018/04/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/windows-48/Modules.h b/bootstrap/windows-48/Modules.h
index 2d074a62..9d10f4ac 100644
--- a/bootstrap/windows-48/Modules.h
+++ b/bootstrap/windows-48/Modules.h
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.1.0 [2018/04/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef Modules__h
 #define Modules__h
diff --git a/bootstrap/windows-48/OPB.c b/bootstrap/windows-48/OPB.c
index 41e56e38..d7012f3e 100644
--- a/bootstrap/windows-48/OPB.c
+++ b/bootstrap/windows-48/OPB.c
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.1.0 [2018/04/24]. 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 0eba52d2..b82bf9ba 100644
--- a/bootstrap/windows-48/OPB.h
+++ b/bootstrap/windows-48/OPB.h
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.1.0 [2018/04/24]. 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 7fa9fa23..42cd3c56 100644
--- a/bootstrap/windows-48/OPC.c
+++ b/bootstrap/windows-48/OPC.c
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.1.0 [2018/04/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/windows-48/OPC.h b/bootstrap/windows-48/OPC.h
index 1e17f6c2..b79317f7 100644
--- a/bootstrap/windows-48/OPC.h
+++ b/bootstrap/windows-48/OPC.h
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.1.0 [2018/04/24]. 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 3dbed3bf..e6b33367 100644
--- a/bootstrap/windows-48/OPM.c
+++ b/bootstrap/windows-48/OPM.c
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.1.0 [2018/04/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/windows-48/OPM.h b/bootstrap/windows-48/OPM.h
index 9c84b7af..1c6ca2ac 100644
--- a/bootstrap/windows-48/OPM.h
+++ b/bootstrap/windows-48/OPM.h
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.1.0 [2018/04/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef OPM__h
 #define OPM__h
diff --git a/bootstrap/windows-48/OPP.c b/bootstrap/windows-48/OPP.c
index 00e4fa0e..54a9f7c8 100644
--- a/bootstrap/windows-48/OPP.c
+++ b/bootstrap/windows-48/OPP.c
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.1.0 [2018/04/24]. 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 010479f8..52242f7c 100644
--- a/bootstrap/windows-48/OPP.h
+++ b/bootstrap/windows-48/OPP.h
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.1.0 [2018/04/24]. 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 74719041..0e42294b 100644
--- a/bootstrap/windows-48/OPS.c
+++ b/bootstrap/windows-48/OPS.c
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. tspaSF */
+/* voc 2.1.0 [2018/04/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
@@ -56,11 +56,11 @@ static void OPS_Str (INT8 *sym)
 			OPS_err(241);
 			break;
 		}
-		OPS_str[i] = OPS_ch;
+		OPS_str[__X(i, 256)] = OPS_ch;
 		i += 1;
 	}
 	OPM_Get(&OPS_ch);
-	OPS_str[i] = 0x00;
+	OPS_str[__X(i, 256)] = 0x00;
 	OPS_intval = i + 1;
 	if (OPS_intval == 2) {
 		*sym = 35;
@@ -76,7 +76,7 @@ static void OPS_Identifier (INT8 *sym)
 	INT16 i;
 	i = 0;
 	do {
-		OPS_name[i] = OPS_ch;
+		OPS_name[__X(i, 256)] = OPS_ch;
 		i += 1;
 		OPM_Get(&OPS_ch);
 	} while (!(((OPS_ch < '0' || ('9' < OPS_ch && __CAP(OPS_ch) < 'A')) || 'Z' < __CAP(OPS_ch)) || i == 256));
@@ -84,7 +84,7 @@ static void OPS_Identifier (INT8 *sym)
 		OPS_err(240);
 		i -= 1;
 	}
-	OPS_name[i] = 0x00;
+	OPS_name[__X(i, 256)] = 0x00;
 	*sym = 38;
 }
 
@@ -143,7 +143,7 @@ static void OPS_Number (void)
 		if (('0' <= OPS_ch && OPS_ch <= '9') || (((d == 0 && 'A' <= OPS_ch)) && OPS_ch <= 'F')) {
 			if (m > 0 || OPS_ch != '0') {
 				if (n < 24) {
-					dig[n] = OPS_ch;
+					dig[__X(n, 24)] = OPS_ch;
 					n += 1;
 				}
 				m += 1;
@@ -173,7 +173,7 @@ static void OPS_Number (void)
 				OPS_numtyp = 1;
 				if (n <= 2) {
 					while (i < n) {
-						OPS_intval = __ASHL(OPS_intval, 4) + (INT64)Ord__7(dig[i], 1);
+						OPS_intval = __ASHL(OPS_intval, 4) + (INT64)Ord__7(dig[__X(i, 24)], 1);
 						i += 1;
 					}
 				} else {
@@ -187,7 +187,7 @@ static void OPS_Number (void)
 						OPS_intval = -1;
 					}
 					while (i < n) {
-						OPS_intval = __ASHL(OPS_intval, 4) + (INT64)Ord__7(dig[i], 1);
+						OPS_intval = __ASHL(OPS_intval, 4) + (INT64)Ord__7(dig[__X(i, 24)], 1);
 						i += 1;
 					}
 				} else {
@@ -196,7 +196,7 @@ static void OPS_Number (void)
 			} else {
 				OPS_numtyp = 2;
 				while (i < n) {
-					d = Ord__7(dig[i], 0);
+					d = Ord__7(dig[__X(i, 24)], 0);
 					i += 1;
 					if (OPS_intval <= __DIV(9223372036854775807LL - (INT64)d, 10)) {
 						OPS_intval = OPS_intval * 10 + (INT64)d;
@@ -214,7 +214,7 @@ static void OPS_Number (void)
 		expCh = 'E';
 		while (n > 0) {
 			n -= 1;
-			f = (Ord__7(dig[n], 0) + f) / (LONGREAL)(LONGREAL)10;
+			f = (Ord__7(dig[__X(n, 24)], 0) + f) / (LONGREAL)(LONGREAL)10;
 		}
 		if (OPS_ch == 'E' || OPS_ch == 'D') {
 			expCh = OPS_ch;
diff --git a/bootstrap/windows-48/OPS.h b/bootstrap/windows-48/OPS.h
index dfe2b972..15cdcc6c 100644
--- a/bootstrap/windows-48/OPS.h
+++ b/bootstrap/windows-48/OPS.h
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. tspaSF */
+/* voc 2.1.0 [2018/04/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef OPS__h
 #define OPS__h
diff --git a/bootstrap/windows-48/OPT.c b/bootstrap/windows-48/OPT.c
index 962b0f86..1897f024 100644
--- a/bootstrap/windows-48/OPT.c
+++ b/bootstrap/windows-48/OPT.c
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.1.0 [2018/04/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/windows-48/OPT.h b/bootstrap/windows-48/OPT.h
index f457c51e..a4688654 100644
--- a/bootstrap/windows-48/OPT.h
+++ b/bootstrap/windows-48/OPT.h
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.1.0 [2018/04/24]. 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 5193f272..ebe18cc4 100644
--- a/bootstrap/windows-48/OPV.c
+++ b/bootstrap/windows-48/OPV.c
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.1.0 [2018/04/24]. 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 bee5e44d..05e906a7 100644
--- a/bootstrap/windows-48/OPV.h
+++ b/bootstrap/windows-48/OPV.h
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.1.0 [2018/04/24]. 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 3bfb1ec7..2407ec4e 100644
--- a/bootstrap/windows-48/Out.c
+++ b/bootstrap/windows-48/Out.c
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.1.0 [2018/04/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/windows-48/Out.h b/bootstrap/windows-48/Out.h
index fad5cd1a..0819285a 100644
--- a/bootstrap/windows-48/Out.h
+++ b/bootstrap/windows-48/Out.h
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.1.0 [2018/04/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef Out__h
 #define Out__h
diff --git a/bootstrap/windows-48/Platform.c b/bootstrap/windows-48/Platform.c
index 65fd2654..62920520 100644
--- a/bootstrap/windows-48/Platform.c
+++ b/bootstrap/windows-48/Platform.c
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.1.0 [2018/04/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/windows-48/Platform.h b/bootstrap/windows-48/Platform.h
index 47755d00..c447f2ba 100644
--- a/bootstrap/windows-48/Platform.h
+++ b/bootstrap/windows-48/Platform.h
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.1.0 [2018/04/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef Platform__h
 #define Platform__h
diff --git a/bootstrap/windows-48/Reals.c b/bootstrap/windows-48/Reals.c
index 2af2574f..44be33b7 100644
--- a/bootstrap/windows-48/Reals.c
+++ b/bootstrap/windows-48/Reals.c
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.1.0 [2018/04/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/windows-48/Reals.h b/bootstrap/windows-48/Reals.h
index 07f4371d..7c2e0e35 100644
--- a/bootstrap/windows-48/Reals.h
+++ b/bootstrap/windows-48/Reals.h
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.1.0 [2018/04/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef Reals__h
 #define Reals__h
diff --git a/bootstrap/windows-48/Strings.c b/bootstrap/windows-48/Strings.c
index 3d82b654..6158bc92 100644
--- a/bootstrap/windows-48/Strings.c
+++ b/bootstrap/windows-48/Strings.c
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.1.0 [2018/04/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/windows-48/Strings.h b/bootstrap/windows-48/Strings.h
index df6f5edc..42b68da8 100644
--- a/bootstrap/windows-48/Strings.h
+++ b/bootstrap/windows-48/Strings.h
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.1.0 [2018/04/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef Strings__h
 #define Strings__h
diff --git a/bootstrap/windows-48/Texts.c b/bootstrap/windows-48/Texts.c
index 8e4938b8..2726593a 100644
--- a/bootstrap/windows-48/Texts.c
+++ b/bootstrap/windows-48/Texts.c
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.1.0 [2018/04/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/windows-48/Texts.h b/bootstrap/windows-48/Texts.h
index 0c55850a..714d9ac5 100644
--- a/bootstrap/windows-48/Texts.h
+++ b/bootstrap/windows-48/Texts.h
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.1.0 [2018/04/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef Texts__h
 #define Texts__h
diff --git a/bootstrap/windows-48/VT100.c b/bootstrap/windows-48/VT100.c
index 5bfcea49..a3b0b0dd 100644
--- a/bootstrap/windows-48/VT100.c
+++ b/bootstrap/windows-48/VT100.c
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.1.0 [2018/04/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/windows-48/VT100.h b/bootstrap/windows-48/VT100.h
index 51c85058..e7539d2f 100644
--- a/bootstrap/windows-48/VT100.h
+++ b/bootstrap/windows-48/VT100.h
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.1.0 [2018/04/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef VT100__h
 #define VT100__h
diff --git a/bootstrap/windows-48/extTools.c b/bootstrap/windows-48/extTools.c
index 2b6c962b..562921ce 100644
--- a/bootstrap/windows-48/extTools.c
+++ b/bootstrap/windows-48/extTools.c
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.1.0 [2018/04/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/windows-48/extTools.h b/bootstrap/windows-48/extTools.h
index 9b0b1ee9..e6dd4577 100644
--- a/bootstrap/windows-48/extTools.h
+++ b/bootstrap/windows-48/extTools.h
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.1.0 [2018/04/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef extTools__h
 #define extTools__h
diff --git a/bootstrap/windows-88/Compiler.c b/bootstrap/windows-88/Compiler.c
index 10abd264..9cdbb76c 100644
--- a/bootstrap/windows-88/Compiler.c
+++ b/bootstrap/windows-88/Compiler.c
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. xtspamS */
+/* voc 2.1.0 [2018/04/24]. 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 8eac398d..3ab08d40 100644
--- a/bootstrap/windows-88/Configuration.c
+++ b/bootstrap/windows-88/Configuration.c
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.1.0 [2018/04/24]. 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("2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8.", Configuration_versionLong, 76);
+	__MOVE("2.1.0 [2018/04/24]. Bootstrapping compiler for address size 8, alignment 8.", Configuration_versionLong, 76);
 	__ENDMOD;
 }
diff --git a/bootstrap/windows-88/Configuration.h b/bootstrap/windows-88/Configuration.h
index c817585e..7db28b57 100644
--- a/bootstrap/windows-88/Configuration.h
+++ b/bootstrap/windows-88/Configuration.h
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.1.0 [2018/04/24]. 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 7a28d41d..178e5cca 100644
--- a/bootstrap/windows-88/Files.c
+++ b/bootstrap/windows-88/Files.c
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. tspaSF */
+/* voc 2.1.0 [2018/04/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
@@ -155,20 +155,20 @@ static void Files_MakeFileName (CHAR *dir, ADDRESS dir__len, CHAR *name, ADDRESS
 	__DUP(name, name__len, CHAR);
 	i = 0;
 	j = 0;
-	while (dir[i] != 0x00) {
-		dest[i] = dir[i];
+	while (dir[__X(i, dir__len)] != 0x00) {
+		dest[__X(i, dest__len)] = dir[__X(i, dir__len)];
 		i += 1;
 	}
-	if (dest[i - 1] != '/') {
-		dest[i] = '/';
+	if (dest[__X(i - 1, dest__len)] != '/') {
+		dest[__X(i, dest__len)] = '/';
 		i += 1;
 	}
-	while (name[j] != 0x00) {
-		dest[i] = name[j];
+	while (name[__X(j, name__len)] != 0x00) {
+		dest[__X(i, dest__len)] = name[__X(j, name__len)];
 		i += 1;
 		j += 1;
 	}
-	dest[i] = 0x00;
+	dest[__X(i, dest__len)] = 0x00;
 	__DEL(dir);
 	__DEL(name);
 }
@@ -181,45 +181,45 @@ static void Files_GetTempName (CHAR *finalName, ADDRESS finalName__len, CHAR *na
 	n = Files_tempno;
 	i = 0;
 	if (finalName[0] != '/') {
-		while (Platform_CWD[i] != 0x00) {
-			name[i] = Platform_CWD[i];
+		while (Platform_CWD[__X(i, 4096)] != 0x00) {
+			name[__X(i, name__len)] = Platform_CWD[__X(i, 4096)];
 			i += 1;
 		}
-		if (Platform_CWD[i - 1] != '/') {
-			name[i] = '/';
+		if (Platform_CWD[__X(i - 1, 4096)] != '/') {
+			name[__X(i, name__len)] = '/';
 			i += 1;
 		}
 	}
 	j = 0;
-	while (finalName[j] != 0x00) {
-		name[i] = finalName[j];
+	while (finalName[__X(j, finalName__len)] != 0x00) {
+		name[__X(i, name__len)] = finalName[__X(j, finalName__len)];
 		i += 1;
 		j += 1;
 	}
 	i -= 1;
-	while (name[i] != '/') {
+	while (name[__X(i, name__len)] != '/') {
 		i -= 1;
 	}
-	name[i + 1] = '.';
-	name[i + 2] = 't';
-	name[i + 3] = 'm';
-	name[i + 4] = 'p';
-	name[i + 5] = '.';
+	name[__X(i + 1, name__len)] = '.';
+	name[__X(i + 2, name__len)] = 't';
+	name[__X(i + 3, name__len)] = 'm';
+	name[__X(i + 4, name__len)] = 'p';
+	name[__X(i + 5, name__len)] = '.';
 	i += 6;
 	while (n > 0) {
-		name[i] = (CHAR)((int)__MOD(n, 10) + 48);
+		name[__X(i, name__len)] = (CHAR)((int)__MOD(n, 10) + 48);
 		n = __DIV(n, 10);
 		i += 1;
 	}
-	name[i] = '.';
+	name[__X(i, name__len)] = '.';
 	i += 1;
 	n = Platform_PID;
 	while (n > 0) {
-		name[i] = (CHAR)((int)__MOD(n, 10) + 48);
+		name[__X(i, name__len)] = (CHAR)((int)__MOD(n, 10) + 48);
 		n = __DIV(n, 10);
 		i += 1;
 	}
-	name[i] = 0x00;
+	name[__X(i, name__len)] = 0x00;
 	__DEL(finalName);
 }
 
@@ -320,8 +320,8 @@ void Files_Close (Files_File f)
 	if (f->state != 1 || f->registerName[0] != 0x00) {
 		Files_Create(f);
 		i = 0;
-		while ((i < 4 && f->bufs[i] != NIL)) {
-			Files_Flush(f->bufs[i]);
+		while ((i < 4 && f->bufs[__X(i, 4)] != NIL)) {
+			Files_Flush(f->bufs[__X(i, 4)]);
 			i += 1;
 		}
 	}
@@ -360,35 +360,35 @@ static void Files_ScanPath (INT16 *pos, CHAR *dir, ADDRESS dir__len)
 			*pos += 1;
 		}
 	} else {
-		ch = (Files_SearchPath->data)[*pos];
+		ch = (Files_SearchPath->data)[__X(*pos, Files_SearchPath->len[0])];
 		while (ch == ' ' || ch == ';') {
 			*pos += 1;
-			ch = (Files_SearchPath->data)[*pos];
+			ch = (Files_SearchPath->data)[__X(*pos, Files_SearchPath->len[0])];
 		}
 		if (ch == '~') {
 			*pos += 1;
-			ch = (Files_SearchPath->data)[*pos];
-			while (Files_HOME[i] != 0x00) {
-				dir[i] = Files_HOME[i];
+			ch = (Files_SearchPath->data)[__X(*pos, Files_SearchPath->len[0])];
+			while (Files_HOME[__X(i, 1024)] != 0x00) {
+				dir[__X(i, dir__len)] = Files_HOME[__X(i, 1024)];
 				i += 1;
 			}
 			if ((((((ch != '/' && ch != 0x00)) && ch != ';')) && ch != ' ')) {
-				while ((i > 0 && dir[i - 1] != '/')) {
+				while ((i > 0 && dir[__X(i - 1, dir__len)] != '/')) {
 					i -= 1;
 				}
 			}
 		}
 		while ((ch != 0x00 && ch != ';')) {
-			dir[i] = ch;
+			dir[__X(i, dir__len)] = ch;
 			i += 1;
 			*pos += 1;
-			ch = (Files_SearchPath->data)[*pos];
+			ch = (Files_SearchPath->data)[__X(*pos, Files_SearchPath->len[0])];
 		}
-		while ((i > 0 && dir[i - 1] == ' ')) {
+		while ((i > 0 && dir[__X(i - 1, dir__len)] == ' ')) {
 			i -= 1;
 		}
 	}
-	dir[i] = 0x00;
+	dir[__X(i, dir__len)] = 0x00;
 }
 
 static BOOLEAN Files_HasDir (CHAR *name, ADDRESS name__len)
@@ -399,7 +399,7 @@ static BOOLEAN Files_HasDir (CHAR *name, ADDRESS name__len)
 	ch = name[0];
 	while ((ch != 0x00 && ch != '/')) {
 		i += 1;
-		ch = name[i];
+		ch = name[__X(i, name__len)];
 	}
 	return ch == '/';
 }
@@ -414,9 +414,9 @@ static Files_File Files_CacheEntry (Platform_FileIdentity identity)
 			if (!Platform_SameFileTime(identity, f->identity)) {
 				i = 0;
 				while (i < 4) {
-					if (f->bufs[i] != NIL) {
-						f->bufs[i]->org = -1;
-						f->bufs[i] = NIL;
+					if (f->bufs[__X(i, 4)] != NIL) {
+						f->bufs[__X(i, 4)]->org = -1;
+						f->bufs[__X(i, 4)] = NIL;
 					}
 					i += 1;
 				}
@@ -515,9 +515,9 @@ void Files_Purge (Files_File f)
 	INT16 error;
 	i = 0;
 	while (i < 4) {
-		if (f->bufs[i] != NIL) {
-			f->bufs[i]->org = -1;
-			f->bufs[i] = NIL;
+		if (f->bufs[__X(i, 4)] != NIL) {
+			f->bufs[__X(i, 4)]->org = -1;
+			f->bufs[__X(i, 4)] = NIL;
 		}
 		i += 1;
 	}
@@ -561,22 +561,22 @@ void Files_Set (Files_Rider *r, ADDRESS *r__typ, Files_File f, INT32 pos)
 		offset = __MASK(pos, -4096);
 		org = pos - offset;
 		i = 0;
-		while ((((i < 4 && f->bufs[i] != NIL)) && org != f->bufs[i]->org)) {
+		while ((((i < 4 && f->bufs[__X(i, 4)] != NIL)) && org != f->bufs[__X(i, 4)]->org)) {
 			i += 1;
 		}
 		if (i < 4) {
-			if (f->bufs[i] == NIL) {
+			if (f->bufs[__X(i, 4)] == NIL) {
 				__NEW(buf, Files_BufDesc);
 				buf->chg = 0;
 				buf->org = -1;
 				buf->f = f;
-				f->bufs[i] = buf;
+				f->bufs[__X(i, 4)] = buf;
 			} else {
-				buf = f->bufs[i];
+				buf = f->bufs[__X(i, 4)];
 			}
 		} else {
 			f->swapper = __MASK(f->swapper + 1, -4);
-			buf = f->bufs[f->swapper];
+			buf = f->bufs[__X(f->swapper, 4)];
 			Files_Flush(buf);
 		}
 		if (buf->org != org) {
@@ -623,7 +623,7 @@ void Files_Read (Files_Rider *r, ADDRESS *r__typ, SYSTEM_BYTE *x)
 	}
 	Files_Assert(offset <= buf->size);
 	if (offset < buf->size) {
-		*x = buf->data[offset];
+		*x = buf->data[__X(offset, 4096)];
 		(*r).offset = offset + 1;
 	} else if ((*r).org + offset < buf->f->len) {
 		Files_Set(&*r, r__typ, (*r).buf->f, (*r).org + offset);
@@ -661,7 +661,7 @@ void Files_ReadBytes (Files_Rider *r, ADDRESS *r__typ, SYSTEM_BYTE *x, ADDRESS x
 		} else {
 			min = n;
 		}
-		__MOVE((ADDRESS)&buf->data[offset], (ADDRESS)&x[xpos], min);
+		__MOVE((ADDRESS)&buf->data[__X(offset, 4096)], (ADDRESS)&x[__X(xpos, x__len)], min);
 		offset += min;
 		(*r).offset = offset;
 		xpos += min;
@@ -690,7 +690,7 @@ void Files_Write (Files_Rider *r, ADDRESS *r__typ, SYSTEM_BYTE x)
 		offset = (*r).offset;
 	}
 	Files_Assert(offset < 4096);
-	buf->data[offset] = x;
+	buf->data[__X(offset, 4096)] = x;
 	buf->chg = 1;
 	if (offset == buf->size) {
 		buf->size += 1;
@@ -724,7 +724,7 @@ void Files_WriteBytes (Files_Rider *r, ADDRESS *r__typ, SYSTEM_BYTE *x, ADDRESS
 		} else {
 			min = n;
 		}
-		__MOVE((ADDRESS)&x[xpos], (ADDRESS)&buf->data[offset], min);
+		__MOVE((ADDRESS)&x[__X(xpos, x__len)], (ADDRESS)&buf->data[__X(offset, 4096)], min);
 		offset += min;
 		(*r).offset = offset;
 		Files_Assert(offset <= 4096);
@@ -845,7 +845,7 @@ static void Files_FlipBytes (SYSTEM_BYTE *src, ADDRESS src__len, SYSTEM_BYTE *de
 		j = 0;
 		while (i > 0) {
 			i -= 1;
-			dest[j] = src[i];
+			dest[__X(j, dest__len)] = src[__X(i, src__len)];
 			j += 1;
 		}
 	} else {
@@ -902,7 +902,7 @@ void Files_ReadString (Files_Rider *R, ADDRESS *R__typ, CHAR *x, ADDRESS x__len)
 	i = 0;
 	do {
 		Files_Read(&*R, R__typ, (void*)&ch);
-		x[i] = ch;
+		x[__X(i, x__len)] = ch;
 		i += 1;
 	} while (!(ch == 0x00));
 }
@@ -912,16 +912,16 @@ void Files_ReadLine (Files_Rider *R, ADDRESS *R__typ, CHAR *x, ADDRESS x__len)
 	INT16 i;
 	i = 0;
 	do {
-		Files_Read(&*R, R__typ, (void*)&x[i]);
+		Files_Read(&*R, R__typ, (void*)&x[__X(i, x__len)]);
 		i += 1;
-	} while (!(x[i - 1] == 0x00 || x[i - 1] == 0x0a));
-	if (x[i - 1] == 0x0a) {
+	} while (!(x[__X(i - 1, x__len)] == 0x00 || x[__X(i - 1, x__len)] == 0x0a));
+	if (x[__X(i - 1, x__len)] == 0x0a) {
 		i -= 1;
 	}
-	if ((i > 0 && x[i - 1] == 0x0d)) {
+	if ((i > 0 && x[__X(i - 1, x__len)] == 0x0d)) {
 		i -= 1;
 	}
-	x[i] = 0x00;
+	x[__X(i, x__len)] = 0x00;
 }
 
 void Files_ReadNum (Files_Rider *R, ADDRESS *R__typ, SYSTEM_BYTE *x, ADDRESS x__len)
@@ -994,7 +994,7 @@ void Files_WriteString (Files_Rider *R, ADDRESS *R__typ, CHAR *x, ADDRESS x__len
 {
 	INT16 i;
 	i = 0;
-	while (x[i] != 0x00) {
+	while (x[__X(i, x__len)] != 0x00) {
 		i += 1;
 	}
 	Files_WriteBytes(&*R, R__typ, (void*)x, x__len * 1, i + 1);
diff --git a/bootstrap/windows-88/Files.h b/bootstrap/windows-88/Files.h
index 16fd4396..658429ef 100644
--- a/bootstrap/windows-88/Files.h
+++ b/bootstrap/windows-88/Files.h
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. tspaSF */
+/* voc 2.1.0 [2018/04/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef Files__h
 #define Files__h
diff --git a/bootstrap/windows-88/Heap.c b/bootstrap/windows-88/Heap.c
index 9e99e657..eb19a612 100644
--- a/bootstrap/windows-88/Heap.c
+++ b/bootstrap/windows-88/Heap.c
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. tsSF */
+/* voc 2.1.0 [2018/04/24]. Bootstrapping compiler for address size 8, alignment 8. tsSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/windows-88/Heap.h b/bootstrap/windows-88/Heap.h
index 2b6287cd..ab574eed 100644
--- a/bootstrap/windows-88/Heap.h
+++ b/bootstrap/windows-88/Heap.h
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. tsSF */
+/* voc 2.1.0 [2018/04/24]. 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 94227779..b3c05745 100644
--- a/bootstrap/windows-88/Modules.c
+++ b/bootstrap/windows-88/Modules.c
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.1.0 [2018/04/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/windows-88/Modules.h b/bootstrap/windows-88/Modules.h
index 5d832fa6..3f97dc19 100644
--- a/bootstrap/windows-88/Modules.h
+++ b/bootstrap/windows-88/Modules.h
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.1.0 [2018/04/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef Modules__h
 #define Modules__h
diff --git a/bootstrap/windows-88/OPB.c b/bootstrap/windows-88/OPB.c
index 41e56e38..d7012f3e 100644
--- a/bootstrap/windows-88/OPB.c
+++ b/bootstrap/windows-88/OPB.c
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.1.0 [2018/04/24]. 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 0eba52d2..b82bf9ba 100644
--- a/bootstrap/windows-88/OPB.h
+++ b/bootstrap/windows-88/OPB.h
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.1.0 [2018/04/24]. 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 7fa9fa23..42cd3c56 100644
--- a/bootstrap/windows-88/OPC.c
+++ b/bootstrap/windows-88/OPC.c
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.1.0 [2018/04/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/windows-88/OPC.h b/bootstrap/windows-88/OPC.h
index 1e17f6c2..b79317f7 100644
--- a/bootstrap/windows-88/OPC.h
+++ b/bootstrap/windows-88/OPC.h
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.1.0 [2018/04/24]. 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 bcf72c6b..28e1ec4b 100644
--- a/bootstrap/windows-88/OPM.c
+++ b/bootstrap/windows-88/OPM.c
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.1.0 [2018/04/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/windows-88/OPM.h b/bootstrap/windows-88/OPM.h
index 9c84b7af..1c6ca2ac 100644
--- a/bootstrap/windows-88/OPM.h
+++ b/bootstrap/windows-88/OPM.h
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.1.0 [2018/04/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef OPM__h
 #define OPM__h
diff --git a/bootstrap/windows-88/OPP.c b/bootstrap/windows-88/OPP.c
index 18305e4c..7508ac7a 100644
--- a/bootstrap/windows-88/OPP.c
+++ b/bootstrap/windows-88/OPP.c
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.1.0 [2018/04/24]. 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 010479f8..52242f7c 100644
--- a/bootstrap/windows-88/OPP.h
+++ b/bootstrap/windows-88/OPP.h
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.1.0 [2018/04/24]. 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 74719041..0e42294b 100644
--- a/bootstrap/windows-88/OPS.c
+++ b/bootstrap/windows-88/OPS.c
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. tspaSF */
+/* voc 2.1.0 [2018/04/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
@@ -56,11 +56,11 @@ static void OPS_Str (INT8 *sym)
 			OPS_err(241);
 			break;
 		}
-		OPS_str[i] = OPS_ch;
+		OPS_str[__X(i, 256)] = OPS_ch;
 		i += 1;
 	}
 	OPM_Get(&OPS_ch);
-	OPS_str[i] = 0x00;
+	OPS_str[__X(i, 256)] = 0x00;
 	OPS_intval = i + 1;
 	if (OPS_intval == 2) {
 		*sym = 35;
@@ -76,7 +76,7 @@ static void OPS_Identifier (INT8 *sym)
 	INT16 i;
 	i = 0;
 	do {
-		OPS_name[i] = OPS_ch;
+		OPS_name[__X(i, 256)] = OPS_ch;
 		i += 1;
 		OPM_Get(&OPS_ch);
 	} while (!(((OPS_ch < '0' || ('9' < OPS_ch && __CAP(OPS_ch) < 'A')) || 'Z' < __CAP(OPS_ch)) || i == 256));
@@ -84,7 +84,7 @@ static void OPS_Identifier (INT8 *sym)
 		OPS_err(240);
 		i -= 1;
 	}
-	OPS_name[i] = 0x00;
+	OPS_name[__X(i, 256)] = 0x00;
 	*sym = 38;
 }
 
@@ -143,7 +143,7 @@ static void OPS_Number (void)
 		if (('0' <= OPS_ch && OPS_ch <= '9') || (((d == 0 && 'A' <= OPS_ch)) && OPS_ch <= 'F')) {
 			if (m > 0 || OPS_ch != '0') {
 				if (n < 24) {
-					dig[n] = OPS_ch;
+					dig[__X(n, 24)] = OPS_ch;
 					n += 1;
 				}
 				m += 1;
@@ -173,7 +173,7 @@ static void OPS_Number (void)
 				OPS_numtyp = 1;
 				if (n <= 2) {
 					while (i < n) {
-						OPS_intval = __ASHL(OPS_intval, 4) + (INT64)Ord__7(dig[i], 1);
+						OPS_intval = __ASHL(OPS_intval, 4) + (INT64)Ord__7(dig[__X(i, 24)], 1);
 						i += 1;
 					}
 				} else {
@@ -187,7 +187,7 @@ static void OPS_Number (void)
 						OPS_intval = -1;
 					}
 					while (i < n) {
-						OPS_intval = __ASHL(OPS_intval, 4) + (INT64)Ord__7(dig[i], 1);
+						OPS_intval = __ASHL(OPS_intval, 4) + (INT64)Ord__7(dig[__X(i, 24)], 1);
 						i += 1;
 					}
 				} else {
@@ -196,7 +196,7 @@ static void OPS_Number (void)
 			} else {
 				OPS_numtyp = 2;
 				while (i < n) {
-					d = Ord__7(dig[i], 0);
+					d = Ord__7(dig[__X(i, 24)], 0);
 					i += 1;
 					if (OPS_intval <= __DIV(9223372036854775807LL - (INT64)d, 10)) {
 						OPS_intval = OPS_intval * 10 + (INT64)d;
@@ -214,7 +214,7 @@ static void OPS_Number (void)
 		expCh = 'E';
 		while (n > 0) {
 			n -= 1;
-			f = (Ord__7(dig[n], 0) + f) / (LONGREAL)(LONGREAL)10;
+			f = (Ord__7(dig[__X(n, 24)], 0) + f) / (LONGREAL)(LONGREAL)10;
 		}
 		if (OPS_ch == 'E' || OPS_ch == 'D') {
 			expCh = OPS_ch;
diff --git a/bootstrap/windows-88/OPS.h b/bootstrap/windows-88/OPS.h
index dfe2b972..15cdcc6c 100644
--- a/bootstrap/windows-88/OPS.h
+++ b/bootstrap/windows-88/OPS.h
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. tspaSF */
+/* voc 2.1.0 [2018/04/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef OPS__h
 #define OPS__h
diff --git a/bootstrap/windows-88/OPT.c b/bootstrap/windows-88/OPT.c
index c6989580..57dfaa59 100644
--- a/bootstrap/windows-88/OPT.c
+++ b/bootstrap/windows-88/OPT.c
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.1.0 [2018/04/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/windows-88/OPT.h b/bootstrap/windows-88/OPT.h
index f457c51e..a4688654 100644
--- a/bootstrap/windows-88/OPT.h
+++ b/bootstrap/windows-88/OPT.h
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.1.0 [2018/04/24]. 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 617e9e58..bad459b6 100644
--- a/bootstrap/windows-88/OPV.c
+++ b/bootstrap/windows-88/OPV.c
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.1.0 [2018/04/24]. 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 bee5e44d..05e906a7 100644
--- a/bootstrap/windows-88/OPV.h
+++ b/bootstrap/windows-88/OPV.h
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.1.0 [2018/04/24]. 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 3bfb1ec7..2407ec4e 100644
--- a/bootstrap/windows-88/Out.c
+++ b/bootstrap/windows-88/Out.c
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.1.0 [2018/04/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/windows-88/Out.h b/bootstrap/windows-88/Out.h
index fad5cd1a..0819285a 100644
--- a/bootstrap/windows-88/Out.h
+++ b/bootstrap/windows-88/Out.h
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.1.0 [2018/04/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef Out__h
 #define Out__h
diff --git a/bootstrap/windows-88/Platform.c b/bootstrap/windows-88/Platform.c
index 361a39fc..9f789ece 100644
--- a/bootstrap/windows-88/Platform.c
+++ b/bootstrap/windows-88/Platform.c
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.1.0 [2018/04/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/windows-88/Platform.h b/bootstrap/windows-88/Platform.h
index 9ca6f851..ee812dcd 100644
--- a/bootstrap/windows-88/Platform.h
+++ b/bootstrap/windows-88/Platform.h
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.1.0 [2018/04/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef Platform__h
 #define Platform__h
diff --git a/bootstrap/windows-88/Reals.c b/bootstrap/windows-88/Reals.c
index 2af2574f..44be33b7 100644
--- a/bootstrap/windows-88/Reals.c
+++ b/bootstrap/windows-88/Reals.c
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.1.0 [2018/04/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/windows-88/Reals.h b/bootstrap/windows-88/Reals.h
index 07f4371d..7c2e0e35 100644
--- a/bootstrap/windows-88/Reals.h
+++ b/bootstrap/windows-88/Reals.h
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.1.0 [2018/04/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef Reals__h
 #define Reals__h
diff --git a/bootstrap/windows-88/Strings.c b/bootstrap/windows-88/Strings.c
index 3d82b654..6158bc92 100644
--- a/bootstrap/windows-88/Strings.c
+++ b/bootstrap/windows-88/Strings.c
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.1.0 [2018/04/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/windows-88/Strings.h b/bootstrap/windows-88/Strings.h
index df6f5edc..42b68da8 100644
--- a/bootstrap/windows-88/Strings.h
+++ b/bootstrap/windows-88/Strings.h
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.1.0 [2018/04/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef Strings__h
 #define Strings__h
diff --git a/bootstrap/windows-88/Texts.c b/bootstrap/windows-88/Texts.c
index 82588563..6a06c85c 100644
--- a/bootstrap/windows-88/Texts.c
+++ b/bootstrap/windows-88/Texts.c
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.1.0 [2018/04/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/windows-88/Texts.h b/bootstrap/windows-88/Texts.h
index b3dd50cb..e4aa3a7d 100644
--- a/bootstrap/windows-88/Texts.h
+++ b/bootstrap/windows-88/Texts.h
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.1.0 [2018/04/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef Texts__h
 #define Texts__h
diff --git a/bootstrap/windows-88/VT100.c b/bootstrap/windows-88/VT100.c
index 5bfcea49..a3b0b0dd 100644
--- a/bootstrap/windows-88/VT100.c
+++ b/bootstrap/windows-88/VT100.c
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.1.0 [2018/04/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/windows-88/VT100.h b/bootstrap/windows-88/VT100.h
index 51c85058..e7539d2f 100644
--- a/bootstrap/windows-88/VT100.h
+++ b/bootstrap/windows-88/VT100.h
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.1.0 [2018/04/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef VT100__h
 #define VT100__h
diff --git a/bootstrap/windows-88/extTools.c b/bootstrap/windows-88/extTools.c
index 2b6c962b..562921ce 100644
--- a/bootstrap/windows-88/extTools.c
+++ b/bootstrap/windows-88/extTools.c
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.1.0 [2018/04/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/windows-88/extTools.h b/bootstrap/windows-88/extTools.h
index 9b0b1ee9..e6dd4577 100644
--- a/bootstrap/windows-88/extTools.h
+++ b/bootstrap/windows-88/extTools.h
@@ -1,4 +1,4 @@
-/* voc 2.1.0 [2018/04/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.1.0 [2018/04/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef extTools__h
 #define extTools__h