diff --git a/bootstrap/unix-44/Compiler.c b/bootstrap/unix-44/Compiler.c
index 5635eb49..87b0392c 100644
--- a/bootstrap/unix-44/Compiler.c
+++ b/bootstrap/unix-44/Compiler.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. xtspamSf */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. xtspamSf */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/unix-44/Configuration.c b/bootstrap/unix-44/Configuration.c
index 88e7a4c9..c15b87f9 100644
--- a/bootstrap/unix-44/Configuration.c
+++ b/bootstrap/unix-44/Configuration.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
@@ -19,6 +19,6 @@ export void *Configuration__init(void)
 	__DEFMOD;
 	__REGMOD("Configuration", 0);
 /* BEGIN */
-	__MOVE("1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8.", Configuration_versionLong, 75);
+	__MOVE("1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8.", Configuration_versionLong, 75);
 	__ENDMOD;
 }
diff --git a/bootstrap/unix-44/Configuration.h b/bootstrap/unix-44/Configuration.h
index 20f55dce..f169a3b6 100644
--- a/bootstrap/unix-44/Configuration.h
+++ b/bootstrap/unix-44/Configuration.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
 
 #ifndef Configuration__h
 #define Configuration__h
diff --git a/bootstrap/unix-44/Files.c b/bootstrap/unix-44/Files.c
index b6483b0d..5aedd8ec 100644
--- a/bootstrap/unix-44/Files.c
+++ b/bootstrap/unix-44/Files.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. tspaSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. tspaSfF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
@@ -883,19 +883,18 @@ void Files_ReadString (Files_Rider *R, ADDRESS *R__typ, CHAR *x, LONGINT x__len)
 void Files_ReadLine (Files_Rider *R, ADDRESS *R__typ, CHAR *x, LONGINT x__len)
 {
 	INT16 i;
-	CHAR ch;
-	BOOLEAN b;
 	i = 0;
-	b = 0;
 	do {
-		Files_Read(&*R, R__typ, (void*)&ch);
-		if ((ch == 0x00 || ch == 0x0a) || ch == 0x0d) {
-			b = 1;
-		} else {
-			x[i] = ch;
-			i += 1;
-		}
-	} while (!b);
+		Files_Read(&*R, R__typ, (void*)&x[i]);
+		i += 1;
+	} while (!(x[i - 1] == 0x00 || x[i - 1] == 0x0a));
+	if (x[i - 1] == 0x0a) {
+		i -= 1;
+	}
+	if ((i > 0 && x[i - 1] == 0x0d)) {
+		i -= 1;
+	}
+	x[i] = 0x00;
 }
 
 void Files_ReadNum (Files_Rider *R, ADDRESS *R__typ, SYSTEM_BYTE *x, LONGINT x__len)
diff --git a/bootstrap/unix-44/Files.h b/bootstrap/unix-44/Files.h
index 1b94c84f..88034b00 100644
--- a/bootstrap/unix-44/Files.h
+++ b/bootstrap/unix-44/Files.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. tspaSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. tspaSfF */
 
 #ifndef Files__h
 #define Files__h
diff --git a/bootstrap/unix-44/Heap.c b/bootstrap/unix-44/Heap.c
index 8ab8db36..45b45394 100644
--- a/bootstrap/unix-44/Heap.c
+++ b/bootstrap/unix-44/Heap.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. tsSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. tsSfF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/unix-44/Heap.h b/bootstrap/unix-44/Heap.h
index a7926fd5..8626628d 100644
--- a/bootstrap/unix-44/Heap.h
+++ b/bootstrap/unix-44/Heap.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. tsSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. tsSfF */
 
 #ifndef Heap__h
 #define Heap__h
diff --git a/bootstrap/unix-44/Modules.c b/bootstrap/unix-44/Modules.c
index 20b68450..5eddf9be 100644
--- a/bootstrap/unix-44/Modules.c
+++ b/bootstrap/unix-44/Modules.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/unix-44/Modules.h b/bootstrap/unix-44/Modules.h
index de306cf5..2da3fa50 100644
--- a/bootstrap/unix-44/Modules.h
+++ b/bootstrap/unix-44/Modules.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
 
 #ifndef Modules__h
 #define Modules__h
diff --git a/bootstrap/unix-44/OPB.c b/bootstrap/unix-44/OPB.c
index d272b474..dcac4eb9 100644
--- a/bootstrap/unix-44/OPB.c
+++ b/bootstrap/unix-44/OPB.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/unix-44/OPB.h b/bootstrap/unix-44/OPB.h
index 880670eb..cb6399f9 100644
--- a/bootstrap/unix-44/OPB.h
+++ b/bootstrap/unix-44/OPB.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
 
 #ifndef OPB__h
 #define OPB__h
diff --git a/bootstrap/unix-44/OPC.c b/bootstrap/unix-44/OPC.c
index 1dba2168..9b3d80c3 100644
--- a/bootstrap/unix-44/OPC.c
+++ b/bootstrap/unix-44/OPC.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/unix-44/OPC.h b/bootstrap/unix-44/OPC.h
index a6816fe2..6cc996c8 100644
--- a/bootstrap/unix-44/OPC.h
+++ b/bootstrap/unix-44/OPC.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
 
 #ifndef OPC__h
 #define OPC__h
diff --git a/bootstrap/unix-44/OPM.c b/bootstrap/unix-44/OPM.c
index 4924854d..0ac4141a 100644
--- a/bootstrap/unix-44/OPM.c
+++ b/bootstrap/unix-44/OPM.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
@@ -38,7 +38,6 @@ export CHAR OPM_objname[64];
 static INT32 OPM_ErrorLineStartPos, OPM_ErrorLineLimitPos, OPM_ErrorLineNumber, OPM_lasterrpos;
 static Texts_Reader OPM_inR;
 static Texts_Text OPM_Log;
-static Texts_Writer OPM_W;
 static Files_Rider OPM_oldSF, OPM_newSF;
 static Files_Rider OPM_R[3];
 static Files_File OPM_oldSFile, OPM_newSFile, OPM_HFile, OPM_BFile, OPM_HIFile;
@@ -1044,7 +1043,6 @@ static void EnumPtrs(void (*P)(void*))
 {
 	__ENUMR(&OPM_inR, Texts_Reader__typ, 48, 1, P);
 	P(OPM_Log);
-	__ENUMR(&OPM_W, Texts_Writer__typ, 36, 1, P);
 	__ENUMR(&OPM_oldSF, Files_Rider__typ, 20, 1, P);
 	__ENUMR(&OPM_newSF, Files_Rider__typ, 20, 1, P);
 	__ENUMR(OPM_R, Files_Rider__typ, 20, 3, P);
@@ -1080,6 +1078,5 @@ export void *OPM__init(void)
 	OPM_MaxLReal =   1.79769296342094e+308;
 	OPM_MinReal = -OPM_MaxReal;
 	OPM_MinLReal = -OPM_MaxLReal;
-	Texts_OpenWriter(&OPM_W, Texts_Writer__typ);
 	__ENDMOD;
 }
diff --git a/bootstrap/unix-44/OPM.h b/bootstrap/unix-44/OPM.h
index d828881d..91212642 100644
--- a/bootstrap/unix-44/OPM.h
+++ b/bootstrap/unix-44/OPM.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
 
 #ifndef OPM__h
 #define OPM__h
diff --git a/bootstrap/unix-44/OPP.c b/bootstrap/unix-44/OPP.c
index a8a90bfc..6a24e3cd 100644
--- a/bootstrap/unix-44/OPP.c
+++ b/bootstrap/unix-44/OPP.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/unix-44/OPP.h b/bootstrap/unix-44/OPP.h
index 806302cb..3cadf5a4 100644
--- a/bootstrap/unix-44/OPP.h
+++ b/bootstrap/unix-44/OPP.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
 
 #ifndef OPP__h
 #define OPP__h
diff --git a/bootstrap/unix-44/OPS.c b/bootstrap/unix-44/OPS.c
index 6cb1973e..898b14b6 100644
--- a/bootstrap/unix-44/OPS.c
+++ b/bootstrap/unix-44/OPS.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. tspaSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. tspaSfF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/unix-44/OPS.h b/bootstrap/unix-44/OPS.h
index 04a8a785..34906046 100644
--- a/bootstrap/unix-44/OPS.h
+++ b/bootstrap/unix-44/OPS.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. tspaSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. tspaSfF */
 
 #ifndef OPS__h
 #define OPS__h
diff --git a/bootstrap/unix-44/OPT.c b/bootstrap/unix-44/OPT.c
index 49df34bf..fc148d64 100644
--- a/bootstrap/unix-44/OPT.c
+++ b/bootstrap/unix-44/OPT.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/unix-44/OPT.h b/bootstrap/unix-44/OPT.h
index b01bfedc..3a248e3c 100644
--- a/bootstrap/unix-44/OPT.h
+++ b/bootstrap/unix-44/OPT.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
 
 #ifndef OPT__h
 #define OPT__h
diff --git a/bootstrap/unix-44/OPV.c b/bootstrap/unix-44/OPV.c
index c90bb72a..77b842f8 100644
--- a/bootstrap/unix-44/OPV.c
+++ b/bootstrap/unix-44/OPV.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/unix-44/OPV.h b/bootstrap/unix-44/OPV.h
index ae75cd60..34e34ae6 100644
--- a/bootstrap/unix-44/OPV.h
+++ b/bootstrap/unix-44/OPV.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
 
 #ifndef OPV__h
 #define OPV__h
diff --git a/bootstrap/unix-44/Out.c b/bootstrap/unix-44/Out.c
index 27e1fa94..09fecc76 100644
--- a/bootstrap/unix-44/Out.c
+++ b/bootstrap/unix-44/Out.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/unix-44/Out.h b/bootstrap/unix-44/Out.h
index 79895677..63fefd3c 100644
--- a/bootstrap/unix-44/Out.h
+++ b/bootstrap/unix-44/Out.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
 
 #ifndef Out__h
 #define Out__h
diff --git a/bootstrap/unix-44/Platform.c b/bootstrap/unix-44/Platform.c
index c90c4c43..bc020535 100644
--- a/bootstrap/unix-44/Platform.c
+++ b/bootstrap/unix-44/Platform.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/unix-44/Platform.h b/bootstrap/unix-44/Platform.h
index bff09b6b..2bbafb50 100644
--- a/bootstrap/unix-44/Platform.h
+++ b/bootstrap/unix-44/Platform.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
 
 #ifndef Platform__h
 #define Platform__h
diff --git a/bootstrap/unix-44/Reals.c b/bootstrap/unix-44/Reals.c
index 37ba21bb..f7860591 100644
--- a/bootstrap/unix-44/Reals.c
+++ b/bootstrap/unix-44/Reals.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/unix-44/Reals.h b/bootstrap/unix-44/Reals.h
index 94d22e76..5ed2ec95 100644
--- a/bootstrap/unix-44/Reals.h
+++ b/bootstrap/unix-44/Reals.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
 
 #ifndef Reals__h
 #define Reals__h
diff --git a/bootstrap/unix-44/Strings.c b/bootstrap/unix-44/Strings.c
index 17fe28a6..5ae2e44e 100644
--- a/bootstrap/unix-44/Strings.c
+++ b/bootstrap/unix-44/Strings.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/unix-44/Strings.h b/bootstrap/unix-44/Strings.h
index 6d2e8625..a9d577f6 100644
--- a/bootstrap/unix-44/Strings.h
+++ b/bootstrap/unix-44/Strings.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
 
 #ifndef Strings__h
 #define Strings__h
diff --git a/bootstrap/unix-44/Texts.c b/bootstrap/unix-44/Texts.c
index 7891a3ab..db16a845 100644
--- a/bootstrap/unix-44/Texts.c
+++ b/bootstrap/unix-44/Texts.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/unix-44/Texts.h b/bootstrap/unix-44/Texts.h
index b8f6a762..f7454dae 100644
--- a/bootstrap/unix-44/Texts.h
+++ b/bootstrap/unix-44/Texts.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
 
 #ifndef Texts__h
 #define Texts__h
diff --git a/bootstrap/unix-44/VT100.c b/bootstrap/unix-44/VT100.c
index 6a492f2a..01b8a481 100644
--- a/bootstrap/unix-44/VT100.c
+++ b/bootstrap/unix-44/VT100.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/unix-44/VT100.h b/bootstrap/unix-44/VT100.h
index 54e1e753..5ee411dd 100644
--- a/bootstrap/unix-44/VT100.h
+++ b/bootstrap/unix-44/VT100.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
 
 #ifndef VT100__h
 #define VT100__h
diff --git a/bootstrap/unix-44/errors.c b/bootstrap/unix-44/errors.c
index 651501a0..b7d411bb 100644
--- a/bootstrap/unix-44/errors.c
+++ b/bootstrap/unix-44/errors.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/unix-44/errors.h b/bootstrap/unix-44/errors.h
index bd6765aa..fa08de1c 100644
--- a/bootstrap/unix-44/errors.h
+++ b/bootstrap/unix-44/errors.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
 
 #ifndef errors__h
 #define errors__h
diff --git a/bootstrap/unix-44/extTools.c b/bootstrap/unix-44/extTools.c
index 23b737c3..74271e5d 100644
--- a/bootstrap/unix-44/extTools.c
+++ b/bootstrap/unix-44/extTools.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/unix-44/extTools.h b/bootstrap/unix-44/extTools.h
index 124b2154..9b7b3c17 100644
--- a/bootstrap/unix-44/extTools.h
+++ b/bootstrap/unix-44/extTools.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
 
 #ifndef extTools__h
 #define extTools__h
diff --git a/bootstrap/unix-48/Compiler.c b/bootstrap/unix-48/Compiler.c
index 5635eb49..87b0392c 100644
--- a/bootstrap/unix-48/Compiler.c
+++ b/bootstrap/unix-48/Compiler.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. xtspamSf */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. xtspamSf */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/unix-48/Configuration.c b/bootstrap/unix-48/Configuration.c
index 88e7a4c9..c15b87f9 100644
--- a/bootstrap/unix-48/Configuration.c
+++ b/bootstrap/unix-48/Configuration.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
@@ -19,6 +19,6 @@ export void *Configuration__init(void)
 	__DEFMOD;
 	__REGMOD("Configuration", 0);
 /* BEGIN */
-	__MOVE("1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8.", Configuration_versionLong, 75);
+	__MOVE("1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8.", Configuration_versionLong, 75);
 	__ENDMOD;
 }
diff --git a/bootstrap/unix-48/Configuration.h b/bootstrap/unix-48/Configuration.h
index 20f55dce..f169a3b6 100644
--- a/bootstrap/unix-48/Configuration.h
+++ b/bootstrap/unix-48/Configuration.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
 
 #ifndef Configuration__h
 #define Configuration__h
diff --git a/bootstrap/unix-48/Files.c b/bootstrap/unix-48/Files.c
index b6483b0d..5aedd8ec 100644
--- a/bootstrap/unix-48/Files.c
+++ b/bootstrap/unix-48/Files.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. tspaSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. tspaSfF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
@@ -883,19 +883,18 @@ void Files_ReadString (Files_Rider *R, ADDRESS *R__typ, CHAR *x, LONGINT x__len)
 void Files_ReadLine (Files_Rider *R, ADDRESS *R__typ, CHAR *x, LONGINT x__len)
 {
 	INT16 i;
-	CHAR ch;
-	BOOLEAN b;
 	i = 0;
-	b = 0;
 	do {
-		Files_Read(&*R, R__typ, (void*)&ch);
-		if ((ch == 0x00 || ch == 0x0a) || ch == 0x0d) {
-			b = 1;
-		} else {
-			x[i] = ch;
-			i += 1;
-		}
-	} while (!b);
+		Files_Read(&*R, R__typ, (void*)&x[i]);
+		i += 1;
+	} while (!(x[i - 1] == 0x00 || x[i - 1] == 0x0a));
+	if (x[i - 1] == 0x0a) {
+		i -= 1;
+	}
+	if ((i > 0 && x[i - 1] == 0x0d)) {
+		i -= 1;
+	}
+	x[i] = 0x00;
 }
 
 void Files_ReadNum (Files_Rider *R, ADDRESS *R__typ, SYSTEM_BYTE *x, LONGINT x__len)
diff --git a/bootstrap/unix-48/Files.h b/bootstrap/unix-48/Files.h
index 1b94c84f..88034b00 100644
--- a/bootstrap/unix-48/Files.h
+++ b/bootstrap/unix-48/Files.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. tspaSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. tspaSfF */
 
 #ifndef Files__h
 #define Files__h
diff --git a/bootstrap/unix-48/Heap.c b/bootstrap/unix-48/Heap.c
index 8ab8db36..45b45394 100644
--- a/bootstrap/unix-48/Heap.c
+++ b/bootstrap/unix-48/Heap.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. tsSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. tsSfF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/unix-48/Heap.h b/bootstrap/unix-48/Heap.h
index a7926fd5..8626628d 100644
--- a/bootstrap/unix-48/Heap.h
+++ b/bootstrap/unix-48/Heap.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. tsSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. tsSfF */
 
 #ifndef Heap__h
 #define Heap__h
diff --git a/bootstrap/unix-48/Modules.c b/bootstrap/unix-48/Modules.c
index 20b68450..5eddf9be 100644
--- a/bootstrap/unix-48/Modules.c
+++ b/bootstrap/unix-48/Modules.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/unix-48/Modules.h b/bootstrap/unix-48/Modules.h
index de306cf5..2da3fa50 100644
--- a/bootstrap/unix-48/Modules.h
+++ b/bootstrap/unix-48/Modules.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
 
 #ifndef Modules__h
 #define Modules__h
diff --git a/bootstrap/unix-48/OPB.c b/bootstrap/unix-48/OPB.c
index d272b474..dcac4eb9 100644
--- a/bootstrap/unix-48/OPB.c
+++ b/bootstrap/unix-48/OPB.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/unix-48/OPB.h b/bootstrap/unix-48/OPB.h
index 880670eb..cb6399f9 100644
--- a/bootstrap/unix-48/OPB.h
+++ b/bootstrap/unix-48/OPB.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
 
 #ifndef OPB__h
 #define OPB__h
diff --git a/bootstrap/unix-48/OPC.c b/bootstrap/unix-48/OPC.c
index 1dba2168..9b3d80c3 100644
--- a/bootstrap/unix-48/OPC.c
+++ b/bootstrap/unix-48/OPC.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/unix-48/OPC.h b/bootstrap/unix-48/OPC.h
index a6816fe2..6cc996c8 100644
--- a/bootstrap/unix-48/OPC.h
+++ b/bootstrap/unix-48/OPC.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
 
 #ifndef OPC__h
 #define OPC__h
diff --git a/bootstrap/unix-48/OPM.c b/bootstrap/unix-48/OPM.c
index 4924854d..0ac4141a 100644
--- a/bootstrap/unix-48/OPM.c
+++ b/bootstrap/unix-48/OPM.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
@@ -38,7 +38,6 @@ export CHAR OPM_objname[64];
 static INT32 OPM_ErrorLineStartPos, OPM_ErrorLineLimitPos, OPM_ErrorLineNumber, OPM_lasterrpos;
 static Texts_Reader OPM_inR;
 static Texts_Text OPM_Log;
-static Texts_Writer OPM_W;
 static Files_Rider OPM_oldSF, OPM_newSF;
 static Files_Rider OPM_R[3];
 static Files_File OPM_oldSFile, OPM_newSFile, OPM_HFile, OPM_BFile, OPM_HIFile;
@@ -1044,7 +1043,6 @@ static void EnumPtrs(void (*P)(void*))
 {
 	__ENUMR(&OPM_inR, Texts_Reader__typ, 48, 1, P);
 	P(OPM_Log);
-	__ENUMR(&OPM_W, Texts_Writer__typ, 36, 1, P);
 	__ENUMR(&OPM_oldSF, Files_Rider__typ, 20, 1, P);
 	__ENUMR(&OPM_newSF, Files_Rider__typ, 20, 1, P);
 	__ENUMR(OPM_R, Files_Rider__typ, 20, 3, P);
@@ -1080,6 +1078,5 @@ export void *OPM__init(void)
 	OPM_MaxLReal =   1.79769296342094e+308;
 	OPM_MinReal = -OPM_MaxReal;
 	OPM_MinLReal = -OPM_MaxLReal;
-	Texts_OpenWriter(&OPM_W, Texts_Writer__typ);
 	__ENDMOD;
 }
diff --git a/bootstrap/unix-48/OPM.h b/bootstrap/unix-48/OPM.h
index d828881d..91212642 100644
--- a/bootstrap/unix-48/OPM.h
+++ b/bootstrap/unix-48/OPM.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
 
 #ifndef OPM__h
 #define OPM__h
diff --git a/bootstrap/unix-48/OPP.c b/bootstrap/unix-48/OPP.c
index a8a90bfc..6a24e3cd 100644
--- a/bootstrap/unix-48/OPP.c
+++ b/bootstrap/unix-48/OPP.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/unix-48/OPP.h b/bootstrap/unix-48/OPP.h
index 806302cb..3cadf5a4 100644
--- a/bootstrap/unix-48/OPP.h
+++ b/bootstrap/unix-48/OPP.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
 
 #ifndef OPP__h
 #define OPP__h
diff --git a/bootstrap/unix-48/OPS.c b/bootstrap/unix-48/OPS.c
index 6cb1973e..898b14b6 100644
--- a/bootstrap/unix-48/OPS.c
+++ b/bootstrap/unix-48/OPS.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. tspaSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. tspaSfF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/unix-48/OPS.h b/bootstrap/unix-48/OPS.h
index 04a8a785..34906046 100644
--- a/bootstrap/unix-48/OPS.h
+++ b/bootstrap/unix-48/OPS.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. tspaSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. tspaSfF */
 
 #ifndef OPS__h
 #define OPS__h
diff --git a/bootstrap/unix-48/OPT.c b/bootstrap/unix-48/OPT.c
index 8d2305be..a8951123 100644
--- a/bootstrap/unix-48/OPT.c
+++ b/bootstrap/unix-48/OPT.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/unix-48/OPT.h b/bootstrap/unix-48/OPT.h
index b01bfedc..3a248e3c 100644
--- a/bootstrap/unix-48/OPT.h
+++ b/bootstrap/unix-48/OPT.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
 
 #ifndef OPT__h
 #define OPT__h
diff --git a/bootstrap/unix-48/OPV.c b/bootstrap/unix-48/OPV.c
index c90bb72a..77b842f8 100644
--- a/bootstrap/unix-48/OPV.c
+++ b/bootstrap/unix-48/OPV.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/unix-48/OPV.h b/bootstrap/unix-48/OPV.h
index ae75cd60..34e34ae6 100644
--- a/bootstrap/unix-48/OPV.h
+++ b/bootstrap/unix-48/OPV.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
 
 #ifndef OPV__h
 #define OPV__h
diff --git a/bootstrap/unix-48/Out.c b/bootstrap/unix-48/Out.c
index 27e1fa94..09fecc76 100644
--- a/bootstrap/unix-48/Out.c
+++ b/bootstrap/unix-48/Out.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/unix-48/Out.h b/bootstrap/unix-48/Out.h
index 79895677..63fefd3c 100644
--- a/bootstrap/unix-48/Out.h
+++ b/bootstrap/unix-48/Out.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
 
 #ifndef Out__h
 #define Out__h
diff --git a/bootstrap/unix-48/Platform.c b/bootstrap/unix-48/Platform.c
index c90c4c43..bc020535 100644
--- a/bootstrap/unix-48/Platform.c
+++ b/bootstrap/unix-48/Platform.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/unix-48/Platform.h b/bootstrap/unix-48/Platform.h
index bff09b6b..2bbafb50 100644
--- a/bootstrap/unix-48/Platform.h
+++ b/bootstrap/unix-48/Platform.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
 
 #ifndef Platform__h
 #define Platform__h
diff --git a/bootstrap/unix-48/Reals.c b/bootstrap/unix-48/Reals.c
index 37ba21bb..f7860591 100644
--- a/bootstrap/unix-48/Reals.c
+++ b/bootstrap/unix-48/Reals.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/unix-48/Reals.h b/bootstrap/unix-48/Reals.h
index 94d22e76..5ed2ec95 100644
--- a/bootstrap/unix-48/Reals.h
+++ b/bootstrap/unix-48/Reals.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
 
 #ifndef Reals__h
 #define Reals__h
diff --git a/bootstrap/unix-48/Strings.c b/bootstrap/unix-48/Strings.c
index 17fe28a6..5ae2e44e 100644
--- a/bootstrap/unix-48/Strings.c
+++ b/bootstrap/unix-48/Strings.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/unix-48/Strings.h b/bootstrap/unix-48/Strings.h
index 6d2e8625..a9d577f6 100644
--- a/bootstrap/unix-48/Strings.h
+++ b/bootstrap/unix-48/Strings.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
 
 #ifndef Strings__h
 #define Strings__h
diff --git a/bootstrap/unix-48/Texts.c b/bootstrap/unix-48/Texts.c
index abf1736a..987b9952 100644
--- a/bootstrap/unix-48/Texts.c
+++ b/bootstrap/unix-48/Texts.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/unix-48/Texts.h b/bootstrap/unix-48/Texts.h
index dd1e65e5..e902469a 100644
--- a/bootstrap/unix-48/Texts.h
+++ b/bootstrap/unix-48/Texts.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
 
 #ifndef Texts__h
 #define Texts__h
diff --git a/bootstrap/unix-48/VT100.c b/bootstrap/unix-48/VT100.c
index 6a492f2a..01b8a481 100644
--- a/bootstrap/unix-48/VT100.c
+++ b/bootstrap/unix-48/VT100.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/unix-48/VT100.h b/bootstrap/unix-48/VT100.h
index 54e1e753..5ee411dd 100644
--- a/bootstrap/unix-48/VT100.h
+++ b/bootstrap/unix-48/VT100.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
 
 #ifndef VT100__h
 #define VT100__h
diff --git a/bootstrap/unix-48/errors.c b/bootstrap/unix-48/errors.c
index 651501a0..b7d411bb 100644
--- a/bootstrap/unix-48/errors.c
+++ b/bootstrap/unix-48/errors.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/unix-48/errors.h b/bootstrap/unix-48/errors.h
index bd6765aa..fa08de1c 100644
--- a/bootstrap/unix-48/errors.h
+++ b/bootstrap/unix-48/errors.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
 
 #ifndef errors__h
 #define errors__h
diff --git a/bootstrap/unix-48/extTools.c b/bootstrap/unix-48/extTools.c
index 23b737c3..74271e5d 100644
--- a/bootstrap/unix-48/extTools.c
+++ b/bootstrap/unix-48/extTools.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/unix-48/extTools.h b/bootstrap/unix-48/extTools.h
index 124b2154..9b7b3c17 100644
--- a/bootstrap/unix-48/extTools.h
+++ b/bootstrap/unix-48/extTools.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
 
 #ifndef extTools__h
 #define extTools__h
diff --git a/bootstrap/unix-88/Compiler.c b/bootstrap/unix-88/Compiler.c
index 5635eb49..87b0392c 100644
--- a/bootstrap/unix-88/Compiler.c
+++ b/bootstrap/unix-88/Compiler.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. xtspamSf */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. xtspamSf */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/unix-88/Configuration.c b/bootstrap/unix-88/Configuration.c
index 88e7a4c9..c15b87f9 100644
--- a/bootstrap/unix-88/Configuration.c
+++ b/bootstrap/unix-88/Configuration.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
@@ -19,6 +19,6 @@ export void *Configuration__init(void)
 	__DEFMOD;
 	__REGMOD("Configuration", 0);
 /* BEGIN */
-	__MOVE("1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8.", Configuration_versionLong, 75);
+	__MOVE("1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8.", Configuration_versionLong, 75);
 	__ENDMOD;
 }
diff --git a/bootstrap/unix-88/Configuration.h b/bootstrap/unix-88/Configuration.h
index 20f55dce..f169a3b6 100644
--- a/bootstrap/unix-88/Configuration.h
+++ b/bootstrap/unix-88/Configuration.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
 
 #ifndef Configuration__h
 #define Configuration__h
diff --git a/bootstrap/unix-88/Files.c b/bootstrap/unix-88/Files.c
index 53e757cf..53ac0902 100644
--- a/bootstrap/unix-88/Files.c
+++ b/bootstrap/unix-88/Files.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. tspaSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. tspaSfF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
@@ -883,19 +883,18 @@ void Files_ReadString (Files_Rider *R, ADDRESS *R__typ, CHAR *x, LONGINT x__len)
 void Files_ReadLine (Files_Rider *R, ADDRESS *R__typ, CHAR *x, LONGINT x__len)
 {
 	INT16 i;
-	CHAR ch;
-	BOOLEAN b;
 	i = 0;
-	b = 0;
 	do {
-		Files_Read(&*R, R__typ, (void*)&ch);
-		if ((ch == 0x00 || ch == 0x0a) || ch == 0x0d) {
-			b = 1;
-		} else {
-			x[i] = ch;
-			i += 1;
-		}
-	} while (!b);
+		Files_Read(&*R, R__typ, (void*)&x[i]);
+		i += 1;
+	} while (!(x[i - 1] == 0x00 || x[i - 1] == 0x0a));
+	if (x[i - 1] == 0x0a) {
+		i -= 1;
+	}
+	if ((i > 0 && x[i - 1] == 0x0d)) {
+		i -= 1;
+	}
+	x[i] = 0x00;
 }
 
 void Files_ReadNum (Files_Rider *R, ADDRESS *R__typ, SYSTEM_BYTE *x, LONGINT x__len)
diff --git a/bootstrap/unix-88/Files.h b/bootstrap/unix-88/Files.h
index 7c86bc8b..3bfefe80 100644
--- a/bootstrap/unix-88/Files.h
+++ b/bootstrap/unix-88/Files.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. tspaSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. tspaSfF */
 
 #ifndef Files__h
 #define Files__h
diff --git a/bootstrap/unix-88/Heap.c b/bootstrap/unix-88/Heap.c
index 65151d07..806a01db 100644
--- a/bootstrap/unix-88/Heap.c
+++ b/bootstrap/unix-88/Heap.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. tsSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. tsSfF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/unix-88/Heap.h b/bootstrap/unix-88/Heap.h
index d37b81db..2603a3eb 100644
--- a/bootstrap/unix-88/Heap.h
+++ b/bootstrap/unix-88/Heap.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. tsSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. tsSfF */
 
 #ifndef Heap__h
 #define Heap__h
diff --git a/bootstrap/unix-88/Modules.c b/bootstrap/unix-88/Modules.c
index 56f6f73e..f463ec4e 100644
--- a/bootstrap/unix-88/Modules.c
+++ b/bootstrap/unix-88/Modules.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/unix-88/Modules.h b/bootstrap/unix-88/Modules.h
index de306cf5..2da3fa50 100644
--- a/bootstrap/unix-88/Modules.h
+++ b/bootstrap/unix-88/Modules.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
 
 #ifndef Modules__h
 #define Modules__h
diff --git a/bootstrap/unix-88/OPB.c b/bootstrap/unix-88/OPB.c
index d272b474..dcac4eb9 100644
--- a/bootstrap/unix-88/OPB.c
+++ b/bootstrap/unix-88/OPB.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/unix-88/OPB.h b/bootstrap/unix-88/OPB.h
index 880670eb..cb6399f9 100644
--- a/bootstrap/unix-88/OPB.h
+++ b/bootstrap/unix-88/OPB.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
 
 #ifndef OPB__h
 #define OPB__h
diff --git a/bootstrap/unix-88/OPC.c b/bootstrap/unix-88/OPC.c
index 1dba2168..9b3d80c3 100644
--- a/bootstrap/unix-88/OPC.c
+++ b/bootstrap/unix-88/OPC.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/unix-88/OPC.h b/bootstrap/unix-88/OPC.h
index a6816fe2..6cc996c8 100644
--- a/bootstrap/unix-88/OPC.h
+++ b/bootstrap/unix-88/OPC.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
 
 #ifndef OPC__h
 #define OPC__h
diff --git a/bootstrap/unix-88/OPM.c b/bootstrap/unix-88/OPM.c
index e077a852..97726a71 100644
--- a/bootstrap/unix-88/OPM.c
+++ b/bootstrap/unix-88/OPM.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
@@ -38,7 +38,6 @@ export CHAR OPM_objname[64];
 static INT32 OPM_ErrorLineStartPos, OPM_ErrorLineLimitPos, OPM_ErrorLineNumber, OPM_lasterrpos;
 static Texts_Reader OPM_inR;
 static Texts_Text OPM_Log;
-static Texts_Writer OPM_W;
 static Files_Rider OPM_oldSF, OPM_newSF;
 static Files_Rider OPM_R[3];
 static Files_File OPM_oldSFile, OPM_newSFile, OPM_HFile, OPM_BFile, OPM_HIFile;
@@ -1044,7 +1043,6 @@ static void EnumPtrs(void (*P)(void*))
 {
 	__ENUMR(&OPM_inR, Texts_Reader__typ, 72, 1, P);
 	P(OPM_Log);
-	__ENUMR(&OPM_W, Texts_Writer__typ, 56, 1, P);
 	__ENUMR(&OPM_oldSF, Files_Rider__typ, 24, 1, P);
 	__ENUMR(&OPM_newSF, Files_Rider__typ, 24, 1, P);
 	__ENUMR(OPM_R, Files_Rider__typ, 24, 3, P);
@@ -1080,6 +1078,5 @@ export void *OPM__init(void)
 	OPM_MaxLReal =   1.79769296342094e+308;
 	OPM_MinReal = -OPM_MaxReal;
 	OPM_MinLReal = -OPM_MaxLReal;
-	Texts_OpenWriter(&OPM_W, Texts_Writer__typ);
 	__ENDMOD;
 }
diff --git a/bootstrap/unix-88/OPM.h b/bootstrap/unix-88/OPM.h
index d828881d..91212642 100644
--- a/bootstrap/unix-88/OPM.h
+++ b/bootstrap/unix-88/OPM.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
 
 #ifndef OPM__h
 #define OPM__h
diff --git a/bootstrap/unix-88/OPP.c b/bootstrap/unix-88/OPP.c
index 4a47eb31..e3840599 100644
--- a/bootstrap/unix-88/OPP.c
+++ b/bootstrap/unix-88/OPP.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/unix-88/OPP.h b/bootstrap/unix-88/OPP.h
index 806302cb..3cadf5a4 100644
--- a/bootstrap/unix-88/OPP.h
+++ b/bootstrap/unix-88/OPP.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
 
 #ifndef OPP__h
 #define OPP__h
diff --git a/bootstrap/unix-88/OPS.c b/bootstrap/unix-88/OPS.c
index 6cb1973e..898b14b6 100644
--- a/bootstrap/unix-88/OPS.c
+++ b/bootstrap/unix-88/OPS.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. tspaSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. tspaSfF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/unix-88/OPS.h b/bootstrap/unix-88/OPS.h
index 04a8a785..34906046 100644
--- a/bootstrap/unix-88/OPS.h
+++ b/bootstrap/unix-88/OPS.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. tspaSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. tspaSfF */
 
 #ifndef OPS__h
 #define OPS__h
diff --git a/bootstrap/unix-88/OPT.c b/bootstrap/unix-88/OPT.c
index 51464c2f..0a7b463e 100644
--- a/bootstrap/unix-88/OPT.c
+++ b/bootstrap/unix-88/OPT.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/unix-88/OPT.h b/bootstrap/unix-88/OPT.h
index b01bfedc..3a248e3c 100644
--- a/bootstrap/unix-88/OPT.h
+++ b/bootstrap/unix-88/OPT.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
 
 #ifndef OPT__h
 #define OPT__h
diff --git a/bootstrap/unix-88/OPV.c b/bootstrap/unix-88/OPV.c
index 4eaacd0b..7c411904 100644
--- a/bootstrap/unix-88/OPV.c
+++ b/bootstrap/unix-88/OPV.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/unix-88/OPV.h b/bootstrap/unix-88/OPV.h
index ae75cd60..34e34ae6 100644
--- a/bootstrap/unix-88/OPV.h
+++ b/bootstrap/unix-88/OPV.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
 
 #ifndef OPV__h
 #define OPV__h
diff --git a/bootstrap/unix-88/Out.c b/bootstrap/unix-88/Out.c
index 27e1fa94..09fecc76 100644
--- a/bootstrap/unix-88/Out.c
+++ b/bootstrap/unix-88/Out.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/unix-88/Out.h b/bootstrap/unix-88/Out.h
index 79895677..63fefd3c 100644
--- a/bootstrap/unix-88/Out.h
+++ b/bootstrap/unix-88/Out.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
 
 #ifndef Out__h
 #define Out__h
diff --git a/bootstrap/unix-88/Platform.c b/bootstrap/unix-88/Platform.c
index 9682a16f..46853757 100644
--- a/bootstrap/unix-88/Platform.c
+++ b/bootstrap/unix-88/Platform.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/unix-88/Platform.h b/bootstrap/unix-88/Platform.h
index 84628711..ca01598a 100644
--- a/bootstrap/unix-88/Platform.h
+++ b/bootstrap/unix-88/Platform.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
 
 #ifndef Platform__h
 #define Platform__h
diff --git a/bootstrap/unix-88/Reals.c b/bootstrap/unix-88/Reals.c
index 37ba21bb..f7860591 100644
--- a/bootstrap/unix-88/Reals.c
+++ b/bootstrap/unix-88/Reals.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/unix-88/Reals.h b/bootstrap/unix-88/Reals.h
index 94d22e76..5ed2ec95 100644
--- a/bootstrap/unix-88/Reals.h
+++ b/bootstrap/unix-88/Reals.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
 
 #ifndef Reals__h
 #define Reals__h
diff --git a/bootstrap/unix-88/Strings.c b/bootstrap/unix-88/Strings.c
index 17fe28a6..5ae2e44e 100644
--- a/bootstrap/unix-88/Strings.c
+++ b/bootstrap/unix-88/Strings.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/unix-88/Strings.h b/bootstrap/unix-88/Strings.h
index 6d2e8625..a9d577f6 100644
--- a/bootstrap/unix-88/Strings.h
+++ b/bootstrap/unix-88/Strings.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
 
 #ifndef Strings__h
 #define Strings__h
diff --git a/bootstrap/unix-88/Texts.c b/bootstrap/unix-88/Texts.c
index 38bcde69..3a949175 100644
--- a/bootstrap/unix-88/Texts.c
+++ b/bootstrap/unix-88/Texts.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/unix-88/Texts.h b/bootstrap/unix-88/Texts.h
index 6ef483f3..216e64dc 100644
--- a/bootstrap/unix-88/Texts.h
+++ b/bootstrap/unix-88/Texts.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
 
 #ifndef Texts__h
 #define Texts__h
diff --git a/bootstrap/unix-88/VT100.c b/bootstrap/unix-88/VT100.c
index 6a492f2a..01b8a481 100644
--- a/bootstrap/unix-88/VT100.c
+++ b/bootstrap/unix-88/VT100.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/unix-88/VT100.h b/bootstrap/unix-88/VT100.h
index 54e1e753..5ee411dd 100644
--- a/bootstrap/unix-88/VT100.h
+++ b/bootstrap/unix-88/VT100.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
 
 #ifndef VT100__h
 #define VT100__h
diff --git a/bootstrap/unix-88/errors.c b/bootstrap/unix-88/errors.c
index 651501a0..b7d411bb 100644
--- a/bootstrap/unix-88/errors.c
+++ b/bootstrap/unix-88/errors.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/unix-88/errors.h b/bootstrap/unix-88/errors.h
index bd6765aa..fa08de1c 100644
--- a/bootstrap/unix-88/errors.h
+++ b/bootstrap/unix-88/errors.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
 
 #ifndef errors__h
 #define errors__h
diff --git a/bootstrap/unix-88/extTools.c b/bootstrap/unix-88/extTools.c
index 23b737c3..74271e5d 100644
--- a/bootstrap/unix-88/extTools.c
+++ b/bootstrap/unix-88/extTools.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/unix-88/extTools.h b/bootstrap/unix-88/extTools.h
index 124b2154..9b7b3c17 100644
--- a/bootstrap/unix-88/extTools.h
+++ b/bootstrap/unix-88/extTools.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
 
 #ifndef extTools__h
 #define extTools__h
diff --git a/bootstrap/windows-48/Compiler.c b/bootstrap/windows-48/Compiler.c
index 5635eb49..87b0392c 100644
--- a/bootstrap/windows-48/Compiler.c
+++ b/bootstrap/windows-48/Compiler.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. xtspamSf */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. xtspamSf */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/windows-48/Configuration.c b/bootstrap/windows-48/Configuration.c
index 88e7a4c9..c15b87f9 100644
--- a/bootstrap/windows-48/Configuration.c
+++ b/bootstrap/windows-48/Configuration.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
@@ -19,6 +19,6 @@ export void *Configuration__init(void)
 	__DEFMOD;
 	__REGMOD("Configuration", 0);
 /* BEGIN */
-	__MOVE("1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8.", Configuration_versionLong, 75);
+	__MOVE("1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8.", Configuration_versionLong, 75);
 	__ENDMOD;
 }
diff --git a/bootstrap/windows-48/Configuration.h b/bootstrap/windows-48/Configuration.h
index 20f55dce..f169a3b6 100644
--- a/bootstrap/windows-48/Configuration.h
+++ b/bootstrap/windows-48/Configuration.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
 
 #ifndef Configuration__h
 #define Configuration__h
diff --git a/bootstrap/windows-48/Files.c b/bootstrap/windows-48/Files.c
index 8f9d4784..1d23fdc4 100644
--- a/bootstrap/windows-48/Files.c
+++ b/bootstrap/windows-48/Files.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. tspaSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. tspaSfF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
@@ -883,19 +883,18 @@ void Files_ReadString (Files_Rider *R, ADDRESS *R__typ, CHAR *x, LONGINT x__len)
 void Files_ReadLine (Files_Rider *R, ADDRESS *R__typ, CHAR *x, LONGINT x__len)
 {
 	INT16 i;
-	CHAR ch;
-	BOOLEAN b;
 	i = 0;
-	b = 0;
 	do {
-		Files_Read(&*R, R__typ, (void*)&ch);
-		if ((ch == 0x00 || ch == 0x0a) || ch == 0x0d) {
-			b = 1;
-		} else {
-			x[i] = ch;
-			i += 1;
-		}
-	} while (!b);
+		Files_Read(&*R, R__typ, (void*)&x[i]);
+		i += 1;
+	} while (!(x[i - 1] == 0x00 || x[i - 1] == 0x0a));
+	if (x[i - 1] == 0x0a) {
+		i -= 1;
+	}
+	if ((i > 0 && x[i - 1] == 0x0d)) {
+		i -= 1;
+	}
+	x[i] = 0x00;
 }
 
 void Files_ReadNum (Files_Rider *R, ADDRESS *R__typ, SYSTEM_BYTE *x, LONGINT x__len)
diff --git a/bootstrap/windows-48/Files.h b/bootstrap/windows-48/Files.h
index c939154b..38b52f44 100644
--- a/bootstrap/windows-48/Files.h
+++ b/bootstrap/windows-48/Files.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. tspaSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. tspaSfF */
 
 #ifndef Files__h
 #define Files__h
diff --git a/bootstrap/windows-48/Heap.c b/bootstrap/windows-48/Heap.c
index 8ab8db36..45b45394 100644
--- a/bootstrap/windows-48/Heap.c
+++ b/bootstrap/windows-48/Heap.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. tsSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. tsSfF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/windows-48/Heap.h b/bootstrap/windows-48/Heap.h
index a7926fd5..8626628d 100644
--- a/bootstrap/windows-48/Heap.h
+++ b/bootstrap/windows-48/Heap.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. tsSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. tsSfF */
 
 #ifndef Heap__h
 #define Heap__h
diff --git a/bootstrap/windows-48/Modules.c b/bootstrap/windows-48/Modules.c
index 20b68450..5eddf9be 100644
--- a/bootstrap/windows-48/Modules.c
+++ b/bootstrap/windows-48/Modules.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/windows-48/Modules.h b/bootstrap/windows-48/Modules.h
index de306cf5..2da3fa50 100644
--- a/bootstrap/windows-48/Modules.h
+++ b/bootstrap/windows-48/Modules.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
 
 #ifndef Modules__h
 #define Modules__h
diff --git a/bootstrap/windows-48/OPB.c b/bootstrap/windows-48/OPB.c
index d272b474..dcac4eb9 100644
--- a/bootstrap/windows-48/OPB.c
+++ b/bootstrap/windows-48/OPB.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/windows-48/OPB.h b/bootstrap/windows-48/OPB.h
index 880670eb..cb6399f9 100644
--- a/bootstrap/windows-48/OPB.h
+++ b/bootstrap/windows-48/OPB.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
 
 #ifndef OPB__h
 #define OPB__h
diff --git a/bootstrap/windows-48/OPC.c b/bootstrap/windows-48/OPC.c
index 1dba2168..9b3d80c3 100644
--- a/bootstrap/windows-48/OPC.c
+++ b/bootstrap/windows-48/OPC.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/windows-48/OPC.h b/bootstrap/windows-48/OPC.h
index a6816fe2..6cc996c8 100644
--- a/bootstrap/windows-48/OPC.h
+++ b/bootstrap/windows-48/OPC.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
 
 #ifndef OPC__h
 #define OPC__h
diff --git a/bootstrap/windows-48/OPM.c b/bootstrap/windows-48/OPM.c
index 4924854d..0ac4141a 100644
--- a/bootstrap/windows-48/OPM.c
+++ b/bootstrap/windows-48/OPM.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
@@ -38,7 +38,6 @@ export CHAR OPM_objname[64];
 static INT32 OPM_ErrorLineStartPos, OPM_ErrorLineLimitPos, OPM_ErrorLineNumber, OPM_lasterrpos;
 static Texts_Reader OPM_inR;
 static Texts_Text OPM_Log;
-static Texts_Writer OPM_W;
 static Files_Rider OPM_oldSF, OPM_newSF;
 static Files_Rider OPM_R[3];
 static Files_File OPM_oldSFile, OPM_newSFile, OPM_HFile, OPM_BFile, OPM_HIFile;
@@ -1044,7 +1043,6 @@ static void EnumPtrs(void (*P)(void*))
 {
 	__ENUMR(&OPM_inR, Texts_Reader__typ, 48, 1, P);
 	P(OPM_Log);
-	__ENUMR(&OPM_W, Texts_Writer__typ, 36, 1, P);
 	__ENUMR(&OPM_oldSF, Files_Rider__typ, 20, 1, P);
 	__ENUMR(&OPM_newSF, Files_Rider__typ, 20, 1, P);
 	__ENUMR(OPM_R, Files_Rider__typ, 20, 3, P);
@@ -1080,6 +1078,5 @@ export void *OPM__init(void)
 	OPM_MaxLReal =   1.79769296342094e+308;
 	OPM_MinReal = -OPM_MaxReal;
 	OPM_MinLReal = -OPM_MaxLReal;
-	Texts_OpenWriter(&OPM_W, Texts_Writer__typ);
 	__ENDMOD;
 }
diff --git a/bootstrap/windows-48/OPM.h b/bootstrap/windows-48/OPM.h
index d828881d..91212642 100644
--- a/bootstrap/windows-48/OPM.h
+++ b/bootstrap/windows-48/OPM.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
 
 #ifndef OPM__h
 #define OPM__h
diff --git a/bootstrap/windows-48/OPP.c b/bootstrap/windows-48/OPP.c
index a8a90bfc..6a24e3cd 100644
--- a/bootstrap/windows-48/OPP.c
+++ b/bootstrap/windows-48/OPP.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/windows-48/OPP.h b/bootstrap/windows-48/OPP.h
index 806302cb..3cadf5a4 100644
--- a/bootstrap/windows-48/OPP.h
+++ b/bootstrap/windows-48/OPP.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
 
 #ifndef OPP__h
 #define OPP__h
diff --git a/bootstrap/windows-48/OPS.c b/bootstrap/windows-48/OPS.c
index 6cb1973e..898b14b6 100644
--- a/bootstrap/windows-48/OPS.c
+++ b/bootstrap/windows-48/OPS.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. tspaSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. tspaSfF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/windows-48/OPS.h b/bootstrap/windows-48/OPS.h
index 04a8a785..34906046 100644
--- a/bootstrap/windows-48/OPS.h
+++ b/bootstrap/windows-48/OPS.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. tspaSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. tspaSfF */
 
 #ifndef OPS__h
 #define OPS__h
diff --git a/bootstrap/windows-48/OPT.c b/bootstrap/windows-48/OPT.c
index 8d2305be..a8951123 100644
--- a/bootstrap/windows-48/OPT.c
+++ b/bootstrap/windows-48/OPT.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/windows-48/OPT.h b/bootstrap/windows-48/OPT.h
index b01bfedc..3a248e3c 100644
--- a/bootstrap/windows-48/OPT.h
+++ b/bootstrap/windows-48/OPT.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
 
 #ifndef OPT__h
 #define OPT__h
diff --git a/bootstrap/windows-48/OPV.c b/bootstrap/windows-48/OPV.c
index c90bb72a..77b842f8 100644
--- a/bootstrap/windows-48/OPV.c
+++ b/bootstrap/windows-48/OPV.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/windows-48/OPV.h b/bootstrap/windows-48/OPV.h
index ae75cd60..34e34ae6 100644
--- a/bootstrap/windows-48/OPV.h
+++ b/bootstrap/windows-48/OPV.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
 
 #ifndef OPV__h
 #define OPV__h
diff --git a/bootstrap/windows-48/Out.c b/bootstrap/windows-48/Out.c
index bad87929..de6a9e16 100644
--- a/bootstrap/windows-48/Out.c
+++ b/bootstrap/windows-48/Out.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/windows-48/Out.h b/bootstrap/windows-48/Out.h
index 79895677..63fefd3c 100644
--- a/bootstrap/windows-48/Out.h
+++ b/bootstrap/windows-48/Out.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
 
 #ifndef Out__h
 #define Out__h
diff --git a/bootstrap/windows-48/Platform.c b/bootstrap/windows-48/Platform.c
index 4a8c3cc0..29801da0 100644
--- a/bootstrap/windows-48/Platform.c
+++ b/bootstrap/windows-48/Platform.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/windows-48/Platform.h b/bootstrap/windows-48/Platform.h
index d6c32fa3..e96a1eec 100644
--- a/bootstrap/windows-48/Platform.h
+++ b/bootstrap/windows-48/Platform.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
 
 #ifndef Platform__h
 #define Platform__h
diff --git a/bootstrap/windows-48/Reals.c b/bootstrap/windows-48/Reals.c
index 37ba21bb..f7860591 100644
--- a/bootstrap/windows-48/Reals.c
+++ b/bootstrap/windows-48/Reals.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/windows-48/Reals.h b/bootstrap/windows-48/Reals.h
index 94d22e76..5ed2ec95 100644
--- a/bootstrap/windows-48/Reals.h
+++ b/bootstrap/windows-48/Reals.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
 
 #ifndef Reals__h
 #define Reals__h
diff --git a/bootstrap/windows-48/Strings.c b/bootstrap/windows-48/Strings.c
index 17fe28a6..5ae2e44e 100644
--- a/bootstrap/windows-48/Strings.c
+++ b/bootstrap/windows-48/Strings.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/windows-48/Strings.h b/bootstrap/windows-48/Strings.h
index 6d2e8625..a9d577f6 100644
--- a/bootstrap/windows-48/Strings.h
+++ b/bootstrap/windows-48/Strings.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
 
 #ifndef Strings__h
 #define Strings__h
diff --git a/bootstrap/windows-48/Texts.c b/bootstrap/windows-48/Texts.c
index abf1736a..987b9952 100644
--- a/bootstrap/windows-48/Texts.c
+++ b/bootstrap/windows-48/Texts.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/windows-48/Texts.h b/bootstrap/windows-48/Texts.h
index dd1e65e5..e902469a 100644
--- a/bootstrap/windows-48/Texts.h
+++ b/bootstrap/windows-48/Texts.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
 
 #ifndef Texts__h
 #define Texts__h
diff --git a/bootstrap/windows-48/VT100.c b/bootstrap/windows-48/VT100.c
index 6a492f2a..01b8a481 100644
--- a/bootstrap/windows-48/VT100.c
+++ b/bootstrap/windows-48/VT100.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/windows-48/VT100.h b/bootstrap/windows-48/VT100.h
index 54e1e753..5ee411dd 100644
--- a/bootstrap/windows-48/VT100.h
+++ b/bootstrap/windows-48/VT100.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
 
 #ifndef VT100__h
 #define VT100__h
diff --git a/bootstrap/windows-48/errors.c b/bootstrap/windows-48/errors.c
index 651501a0..b7d411bb 100644
--- a/bootstrap/windows-48/errors.c
+++ b/bootstrap/windows-48/errors.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/windows-48/errors.h b/bootstrap/windows-48/errors.h
index bd6765aa..fa08de1c 100644
--- a/bootstrap/windows-48/errors.h
+++ b/bootstrap/windows-48/errors.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
 
 #ifndef errors__h
 #define errors__h
diff --git a/bootstrap/windows-48/extTools.c b/bootstrap/windows-48/extTools.c
index 23b737c3..74271e5d 100644
--- a/bootstrap/windows-48/extTools.c
+++ b/bootstrap/windows-48/extTools.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/windows-48/extTools.h b/bootstrap/windows-48/extTools.h
index 124b2154..9b7b3c17 100644
--- a/bootstrap/windows-48/extTools.h
+++ b/bootstrap/windows-48/extTools.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
 
 #ifndef extTools__h
 #define extTools__h
diff --git a/bootstrap/windows-88/Compiler.c b/bootstrap/windows-88/Compiler.c
index 5635eb49..87b0392c 100644
--- a/bootstrap/windows-88/Compiler.c
+++ b/bootstrap/windows-88/Compiler.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. xtspamSf */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. xtspamSf */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/windows-88/Configuration.c b/bootstrap/windows-88/Configuration.c
index 88e7a4c9..c15b87f9 100644
--- a/bootstrap/windows-88/Configuration.c
+++ b/bootstrap/windows-88/Configuration.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
@@ -19,6 +19,6 @@ export void *Configuration__init(void)
 	__DEFMOD;
 	__REGMOD("Configuration", 0);
 /* BEGIN */
-	__MOVE("1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8.", Configuration_versionLong, 75);
+	__MOVE("1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8.", Configuration_versionLong, 75);
 	__ENDMOD;
 }
diff --git a/bootstrap/windows-88/Configuration.h b/bootstrap/windows-88/Configuration.h
index 20f55dce..f169a3b6 100644
--- a/bootstrap/windows-88/Configuration.h
+++ b/bootstrap/windows-88/Configuration.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
 
 #ifndef Configuration__h
 #define Configuration__h
diff --git a/bootstrap/windows-88/Files.c b/bootstrap/windows-88/Files.c
index 683c021e..c519f8d5 100644
--- a/bootstrap/windows-88/Files.c
+++ b/bootstrap/windows-88/Files.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. tspaSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. tspaSfF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
@@ -885,19 +885,18 @@ void Files_ReadString (Files_Rider *R, ADDRESS *R__typ, CHAR *x, LONGINT x__len)
 void Files_ReadLine (Files_Rider *R, ADDRESS *R__typ, CHAR *x, LONGINT x__len)
 {
 	INT16 i;
-	CHAR ch;
-	BOOLEAN b;
 	i = 0;
-	b = 0;
 	do {
-		Files_Read(&*R, R__typ, (void*)&ch);
-		if ((ch == 0x00 || ch == 0x0a) || ch == 0x0d) {
-			b = 1;
-		} else {
-			x[i] = ch;
-			i += 1;
-		}
-	} while (!b);
+		Files_Read(&*R, R__typ, (void*)&x[i]);
+		i += 1;
+	} while (!(x[i - 1] == 0x00 || x[i - 1] == 0x0a));
+	if (x[i - 1] == 0x0a) {
+		i -= 1;
+	}
+	if ((i > 0 && x[i - 1] == 0x0d)) {
+		i -= 1;
+	}
+	x[i] = 0x00;
 }
 
 void Files_ReadNum (Files_Rider *R, ADDRESS *R__typ, SYSTEM_BYTE *x, LONGINT x__len)
diff --git a/bootstrap/windows-88/Files.h b/bootstrap/windows-88/Files.h
index 2bc98b79..376ef83e 100644
--- a/bootstrap/windows-88/Files.h
+++ b/bootstrap/windows-88/Files.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. tspaSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. tspaSfF */
 
 #ifndef Files__h
 #define Files__h
diff --git a/bootstrap/windows-88/Heap.c b/bootstrap/windows-88/Heap.c
index 65151d07..806a01db 100644
--- a/bootstrap/windows-88/Heap.c
+++ b/bootstrap/windows-88/Heap.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. tsSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. tsSfF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/windows-88/Heap.h b/bootstrap/windows-88/Heap.h
index d37b81db..2603a3eb 100644
--- a/bootstrap/windows-88/Heap.h
+++ b/bootstrap/windows-88/Heap.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. tsSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. tsSfF */
 
 #ifndef Heap__h
 #define Heap__h
diff --git a/bootstrap/windows-88/Modules.c b/bootstrap/windows-88/Modules.c
index 56f6f73e..f463ec4e 100644
--- a/bootstrap/windows-88/Modules.c
+++ b/bootstrap/windows-88/Modules.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/windows-88/Modules.h b/bootstrap/windows-88/Modules.h
index de306cf5..2da3fa50 100644
--- a/bootstrap/windows-88/Modules.h
+++ b/bootstrap/windows-88/Modules.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
 
 #ifndef Modules__h
 #define Modules__h
diff --git a/bootstrap/windows-88/OPB.c b/bootstrap/windows-88/OPB.c
index d272b474..dcac4eb9 100644
--- a/bootstrap/windows-88/OPB.c
+++ b/bootstrap/windows-88/OPB.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/windows-88/OPB.h b/bootstrap/windows-88/OPB.h
index 880670eb..cb6399f9 100644
--- a/bootstrap/windows-88/OPB.h
+++ b/bootstrap/windows-88/OPB.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
 
 #ifndef OPB__h
 #define OPB__h
diff --git a/bootstrap/windows-88/OPC.c b/bootstrap/windows-88/OPC.c
index 1dba2168..9b3d80c3 100644
--- a/bootstrap/windows-88/OPC.c
+++ b/bootstrap/windows-88/OPC.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/windows-88/OPC.h b/bootstrap/windows-88/OPC.h
index a6816fe2..6cc996c8 100644
--- a/bootstrap/windows-88/OPC.h
+++ b/bootstrap/windows-88/OPC.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
 
 #ifndef OPC__h
 #define OPC__h
diff --git a/bootstrap/windows-88/OPM.c b/bootstrap/windows-88/OPM.c
index e077a852..97726a71 100644
--- a/bootstrap/windows-88/OPM.c
+++ b/bootstrap/windows-88/OPM.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
@@ -38,7 +38,6 @@ export CHAR OPM_objname[64];
 static INT32 OPM_ErrorLineStartPos, OPM_ErrorLineLimitPos, OPM_ErrorLineNumber, OPM_lasterrpos;
 static Texts_Reader OPM_inR;
 static Texts_Text OPM_Log;
-static Texts_Writer OPM_W;
 static Files_Rider OPM_oldSF, OPM_newSF;
 static Files_Rider OPM_R[3];
 static Files_File OPM_oldSFile, OPM_newSFile, OPM_HFile, OPM_BFile, OPM_HIFile;
@@ -1044,7 +1043,6 @@ static void EnumPtrs(void (*P)(void*))
 {
 	__ENUMR(&OPM_inR, Texts_Reader__typ, 72, 1, P);
 	P(OPM_Log);
-	__ENUMR(&OPM_W, Texts_Writer__typ, 56, 1, P);
 	__ENUMR(&OPM_oldSF, Files_Rider__typ, 24, 1, P);
 	__ENUMR(&OPM_newSF, Files_Rider__typ, 24, 1, P);
 	__ENUMR(OPM_R, Files_Rider__typ, 24, 3, P);
@@ -1080,6 +1078,5 @@ export void *OPM__init(void)
 	OPM_MaxLReal =   1.79769296342094e+308;
 	OPM_MinReal = -OPM_MaxReal;
 	OPM_MinLReal = -OPM_MaxLReal;
-	Texts_OpenWriter(&OPM_W, Texts_Writer__typ);
 	__ENDMOD;
 }
diff --git a/bootstrap/windows-88/OPM.h b/bootstrap/windows-88/OPM.h
index d828881d..91212642 100644
--- a/bootstrap/windows-88/OPM.h
+++ b/bootstrap/windows-88/OPM.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
 
 #ifndef OPM__h
 #define OPM__h
diff --git a/bootstrap/windows-88/OPP.c b/bootstrap/windows-88/OPP.c
index 4a47eb31..e3840599 100644
--- a/bootstrap/windows-88/OPP.c
+++ b/bootstrap/windows-88/OPP.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/windows-88/OPP.h b/bootstrap/windows-88/OPP.h
index 806302cb..3cadf5a4 100644
--- a/bootstrap/windows-88/OPP.h
+++ b/bootstrap/windows-88/OPP.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
 
 #ifndef OPP__h
 #define OPP__h
diff --git a/bootstrap/windows-88/OPS.c b/bootstrap/windows-88/OPS.c
index 6cb1973e..898b14b6 100644
--- a/bootstrap/windows-88/OPS.c
+++ b/bootstrap/windows-88/OPS.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. tspaSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. tspaSfF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/windows-88/OPS.h b/bootstrap/windows-88/OPS.h
index 04a8a785..34906046 100644
--- a/bootstrap/windows-88/OPS.h
+++ b/bootstrap/windows-88/OPS.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. tspaSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. tspaSfF */
 
 #ifndef OPS__h
 #define OPS__h
diff --git a/bootstrap/windows-88/OPT.c b/bootstrap/windows-88/OPT.c
index 51464c2f..0a7b463e 100644
--- a/bootstrap/windows-88/OPT.c
+++ b/bootstrap/windows-88/OPT.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/windows-88/OPT.h b/bootstrap/windows-88/OPT.h
index b01bfedc..3a248e3c 100644
--- a/bootstrap/windows-88/OPT.h
+++ b/bootstrap/windows-88/OPT.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
 
 #ifndef OPT__h
 #define OPT__h
diff --git a/bootstrap/windows-88/OPV.c b/bootstrap/windows-88/OPV.c
index 4eaacd0b..7c411904 100644
--- a/bootstrap/windows-88/OPV.c
+++ b/bootstrap/windows-88/OPV.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/windows-88/OPV.h b/bootstrap/windows-88/OPV.h
index ae75cd60..34e34ae6 100644
--- a/bootstrap/windows-88/OPV.h
+++ b/bootstrap/windows-88/OPV.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
 
 #ifndef OPV__h
 #define OPV__h
diff --git a/bootstrap/windows-88/Out.c b/bootstrap/windows-88/Out.c
index bad87929..de6a9e16 100644
--- a/bootstrap/windows-88/Out.c
+++ b/bootstrap/windows-88/Out.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/windows-88/Out.h b/bootstrap/windows-88/Out.h
index 79895677..63fefd3c 100644
--- a/bootstrap/windows-88/Out.h
+++ b/bootstrap/windows-88/Out.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
 
 #ifndef Out__h
 #define Out__h
diff --git a/bootstrap/windows-88/Platform.c b/bootstrap/windows-88/Platform.c
index c0d60542..151ed04c 100644
--- a/bootstrap/windows-88/Platform.c
+++ b/bootstrap/windows-88/Platform.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/windows-88/Platform.h b/bootstrap/windows-88/Platform.h
index e2e65585..e3841844 100644
--- a/bootstrap/windows-88/Platform.h
+++ b/bootstrap/windows-88/Platform.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
 
 #ifndef Platform__h
 #define Platform__h
diff --git a/bootstrap/windows-88/Reals.c b/bootstrap/windows-88/Reals.c
index 37ba21bb..f7860591 100644
--- a/bootstrap/windows-88/Reals.c
+++ b/bootstrap/windows-88/Reals.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/windows-88/Reals.h b/bootstrap/windows-88/Reals.h
index 94d22e76..5ed2ec95 100644
--- a/bootstrap/windows-88/Reals.h
+++ b/bootstrap/windows-88/Reals.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
 
 #ifndef Reals__h
 #define Reals__h
diff --git a/bootstrap/windows-88/Strings.c b/bootstrap/windows-88/Strings.c
index 17fe28a6..5ae2e44e 100644
--- a/bootstrap/windows-88/Strings.c
+++ b/bootstrap/windows-88/Strings.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/windows-88/Strings.h b/bootstrap/windows-88/Strings.h
index 6d2e8625..a9d577f6 100644
--- a/bootstrap/windows-88/Strings.h
+++ b/bootstrap/windows-88/Strings.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
 
 #ifndef Strings__h
 #define Strings__h
diff --git a/bootstrap/windows-88/Texts.c b/bootstrap/windows-88/Texts.c
index 38bcde69..3a949175 100644
--- a/bootstrap/windows-88/Texts.c
+++ b/bootstrap/windows-88/Texts.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/windows-88/Texts.h b/bootstrap/windows-88/Texts.h
index 6ef483f3..216e64dc 100644
--- a/bootstrap/windows-88/Texts.h
+++ b/bootstrap/windows-88/Texts.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
 
 #ifndef Texts__h
 #define Texts__h
diff --git a/bootstrap/windows-88/VT100.c b/bootstrap/windows-88/VT100.c
index 6a492f2a..01b8a481 100644
--- a/bootstrap/windows-88/VT100.c
+++ b/bootstrap/windows-88/VT100.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/windows-88/VT100.h b/bootstrap/windows-88/VT100.h
index 54e1e753..5ee411dd 100644
--- a/bootstrap/windows-88/VT100.h
+++ b/bootstrap/windows-88/VT100.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
 
 #ifndef VT100__h
 #define VT100__h
diff --git a/bootstrap/windows-88/errors.c b/bootstrap/windows-88/errors.c
index 651501a0..b7d411bb 100644
--- a/bootstrap/windows-88/errors.c
+++ b/bootstrap/windows-88/errors.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/windows-88/errors.h b/bootstrap/windows-88/errors.h
index bd6765aa..fa08de1c 100644
--- a/bootstrap/windows-88/errors.h
+++ b/bootstrap/windows-88/errors.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
 
 #ifndef errors__h
 #define errors__h
diff --git a/bootstrap/windows-88/extTools.c b/bootstrap/windows-88/extTools.c
index 23b737c3..74271e5d 100644
--- a/bootstrap/windows-88/extTools.c
+++ b/bootstrap/windows-88/extTools.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/windows-88/extTools.h b/bootstrap/windows-88/extTools.h
index 124b2154..9b7b3c17 100644
--- a/bootstrap/windows-88/extTools.h
+++ b/bootstrap/windows-88/extTools.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/11/10]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
+/* voc 1.95 [2016/11/11]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
 
 #ifndef extTools__h
 #define extTools__h
diff --git a/src/compiler/OPM.Mod b/src/compiler/OPM.Mod
index 48337bfc..f765cd2e 100644
--- a/src/compiler/OPM.Mod
+++ b/src/compiler/OPM.Mod
@@ -112,7 +112,6 @@ MODULE OPM;  (* RC 6.3.89 / 28.6.89, J.Templ 10.7.89 / 22.7.96  *)
     lasterrpos:   LONGINT;
     inR:          Texts.Reader;
     Log:          Texts.Text;
-    W:            Texts.Writer;
     oldSF, newSF: Files.Rider;
     R:            ARRAY 3 OF Files.Rider;
 
@@ -811,6 +810,4 @@ BEGIN
   MaxLReal := 1.7976931348623157D307 * 9.999999; (* LONGREAL is 8 bytes, should be 1.7976931348623157D308 *)
   MinReal  := -MaxReal;
   MinLReal := -MaxLReal;
-
-  Texts.OpenWriter(W);
 END OPM.
diff --git a/src/library/v4/Modules.Mod b/src/library/v4/Modules.Mod
deleted file mode 100644
index 46c933f5..00000000
--- a/src/library/v4/Modules.Mod
+++ /dev/null
@@ -1,96 +0,0 @@
-MODULE Modules;  (* jt 6.1.96 *)
-
-  (* access to list of modules and commands, based on ETH Oberon *)
-
-
-  IMPORT SYSTEM, Console, Heap;
-
-  CONST
-    ModNameLen* = 20;
-
-  TYPE
-    ModuleName* = ARRAY ModNameLen OF CHAR;
-    Module* = POINTER TO ModuleDesc;
-    Cmd* = POINTER TO CmdDesc;
-    ModuleDesc* = RECORD  (* cf. SYSTEM.Mod *)
-      next-: Module;
-      name-: ModuleName;
-      refcnt-: LONGINT;
-      cmds-: Cmd;
-      types-: LONGINT;
-      enumPtrs-: PROCEDURE (P: PROCEDURE(p: LONGINT));
-      reserved1, reserved2: LONGINT;
-    END ;
-
-    Command* = PROCEDURE;
-
-    CmdDesc* = RECORD
-      next-: Cmd;
-      name-: ARRAY 24 OF CHAR;
-      cmd-: Command
-    END ;
-
-  VAR
-    res*: INTEGER;
-    resMsg*: ARRAY 256 OF CHAR;
-    imported*, importing*: ModuleName;
-
-
-  PROCEDURE -modules*(): Module
-      "(Modules_Module)Heap_modules";
-
-  PROCEDURE -setmodules*(m: Module)
-      "Heap_modules = m";
-
-
-  PROCEDURE Append(VAR a: ARRAY OF CHAR; b: ARRAY OF CHAR);
-    VAR i, j: INTEGER;
-  BEGIN
-    i := 0; WHILE a[i] # 0X DO INC(i) END;
-    j := 0; WHILE b[j] # 0X DO a[i] := b[j]; INC(i); INC(j) END;
-    a[i] := 0X
-  END Append;
-
-  PROCEDURE ThisMod* (name: ARRAY OF CHAR): Module;
-    VAR m: Module; bodyname: ARRAY 64 OF CHAR; body: Command;
-  BEGIN m := modules();
-    WHILE (m # NIL) & (m.name # name) DO m := m.next END ;
-    IF m # NIL THEN res := 0; resMsg := ""
-    ELSE res := 1; COPY(name, importing);
-      resMsg := ' module "'; Append(resMsg, name); Append(resMsg, '" not found');
-    END ;
-    RETURN m
-  END ThisMod;
-
-  PROCEDURE ThisCommand* (mod: Module; name: ARRAY OF CHAR): Command;
-    VAR c: Cmd;
-  BEGIN c := mod.cmds;
-    WHILE (c # NIL) & (c.name # name) DO c := c.next END ;
-    IF c # NIL THEN res := 0; resMsg := ""; RETURN c.cmd
-    ELSE res := 2; resMsg := ' command "'; COPY(name, importing);
-      Append(resMsg, mod.name); Append(resMsg, "."); Append(resMsg, name); Append(resMsg, '" not found');
-      RETURN NIL
-    END
-  END ThisCommand;
-
-  PROCEDURE Free*(name: ARRAY OF CHAR; all: BOOLEAN);
-    VAR m, p: Module;
-  BEGIN m := modules();
-    IF all THEN
-      res := 1; resMsg := 'unloading "all" not yet supported'
-    ELSE
-      WHILE (m # NIL) & (m.name # name) DO p := m; m := m.next END ;
-      IF (m # NIL) & (m.refcnt = 0) THEN
-        IF m = modules() THEN setmodules(m.next)
-        ELSE p.next := m.next
-        END ;
-        res := 0
-      ELSE res := 1;
-        IF m = NIL THEN resMsg := "module not found"
-        ELSE resMsg := "clients of this module exist"
-        END
-      END
-    END
-  END Free;
-
-END Modules.
diff --git a/src/library/v4/Reals.Mod b/src/library/v4/Reals.Mod
deleted file mode 100644
index f9e6617b..00000000
--- a/src/library/v4/Reals.Mod
+++ /dev/null
@@ -1,136 +0,0 @@
-MODULE Reals;
-  (* JT, 5.2.90 / RC 9.12.91 conversion between reals and strings for HP-700, MB 9.12.91, JT for Ofront, 16.3. 95*)
-  (* DCWB 20160817 Made independent of INTEGER size *)
-
-  IMPORT SYSTEM;
-
-  PROCEDURE Ten*(e: INTEGER): REAL;
-  VAR r, power: LONGREAL;
-  BEGIN r := 1.0;
-    power := 10.0;
-    WHILE e > 0 DO
-      IF ODD(e) THEN r := r * power END ;
-      power := power * power; e := e DIV 2
-    END ;
-    RETURN SHORT(r)
-  END Ten;
-
-
-  PROCEDURE TenL*(e: INTEGER): LONGREAL;
-    VAR r, power: LONGREAL;
-  BEGIN r := 1.0;
-    power := 10.0;
-    LOOP
-      IF ODD(e) THEN r := r * power END ;
-      e := e DIV 2;
-      IF e <= 0 THEN RETURN r END ;
-      power := power * power
-    END
-  END TenL;
-
-
-  (* Real number format (IEEE 754)
-
-    TYPE REAL - Single precision / binary32:
-      1/sign, 8/exponent, 23/significand
-
-    TYPE LONGREAL - Double precision / binary64:
-      1/sign, 11/exponent, 52/significand
-
-    exponent:
-      stored as exponent value + 127.
-
-    significand (fraction):
-      excludes leading (most significant) bit which is assumed to be 1.
-  *)
-
-
-  PROCEDURE Expo*(x: REAL): INTEGER;
-    VAR i: INTEGER;
-  BEGIN
-    SYSTEM.GET(SYSTEM.ADR(x)+2, i);
-    RETURN (i DIV 128) MOD 256
-  END Expo;
-
-  PROCEDURE SetExpo*(VAR x: REAL; ex: INTEGER);
-  VAR c: CHAR;
-  BEGIN
-    (* Replace exponent bits within top byte of REAL *)
-    SYSTEM.GET(SYSTEM.ADR(x)+3, c);
-    SYSTEM.PUT(SYSTEM.ADR(x)+3, CHR(((ORD(c) DIV 128) * 128) + ((ex DIV 2) MOD 128)));
-    (* Replace exponent bits within 2nd byte of REAL *)
-    SYSTEM.GET(SYSTEM.ADR(x)+2, c);
-    SYSTEM.PUT(SYSTEM.ADR(x)+2, CHR((ORD(c) MOD 128) + ((ex MOD 2) * 128)))
-  END SetExpo;
-
-  PROCEDURE ExpoL*(x: LONGREAL): INTEGER;
-    VAR i: INTEGER;
-  BEGIN
-    SYSTEM.GET(SYSTEM.ADR(x)+6, i);
-    RETURN (i DIV 16) MOD 2048
-  END ExpoL;
-
-  (* Convert LONGREAL: Write positive integer value of x into array d.
-     The value is stored backwards, i.e. least significant digit
-     first. n digits are written, with trailing zeros fill.
-     On entry x has been scaled to the number of digits required. *)
-  PROCEDURE ConvertL*(x: LONGREAL; n: INTEGER; VAR d: ARRAY OF CHAR);
-    VAR i, j, k: LONGINT;
-  BEGIN
-    IF x < 0 THEN x := -x END;
-    k := 0;
-
-    IF (SIZE(LONGINT) < 8) & (n > 9) THEN
-      (* There are more decimal digits than can be held in a single LONGINT *)
-      i := ENTIER(x /      1000000000.0D0);  (* The 10th and higher digits *)
-      j := ENTIER(x - (i * 1000000000.0D0)); (* The low 9 digits *)
-      (* First generate the low 9 digits. *)
-      IF j < 0 THEN j := 0 END;
-      WHILE k < 9 DO
-        d[k] := CHR(j MOD 10 + 48); j := j DIV 10; INC(k)
-      END;
-      (* Fall through to generate the upper digits *)
-    ELSE
-      (* We can generate all the digits in one go. *)
-      i := ENTIER(x);
-    END;
-
-    WHILE k < n DO
-      d[k] := CHR(i MOD 10 + 48); i := i DIV 10; INC(k)
-    END
-  END ConvertL;
-
-
-  PROCEDURE Convert*(x: REAL; n: INTEGER; VAR d: ARRAY OF CHAR);
-  BEGIN ConvertL(x, n, d)
-  END Convert;
-
-  PROCEDURE ToHex(i: INTEGER): CHAR;
-  BEGIN
-    IF i < 10 THEN RETURN CHR(i+48)
-    ELSE           RETURN CHR(i+55) END
-  END ToHex;
-
-  PROCEDURE BytesToHex(VAR b, d: ARRAY OF SYSTEM.BYTE);
-    VAR i: INTEGER; l: LONGINT; by: CHAR;
-  BEGIN
-    i := 0; l := LEN(b);
-    WHILE i < l DO
-      by := SYSTEM.VAL(CHAR, b[i]);
-      d[i*2]   := ToHex(ORD(by) DIV 16);
-      d[i*2+1] := ToHex(ORD(by) MOD 16);
-      INC(i)
-    END
-  END BytesToHex;
-
-  (* Convert Hex *)
-  PROCEDURE ConvertH*(y: REAL; VAR d: ARRAY OF CHAR);
-  BEGIN BytesToHex(y, d)
-  END ConvertH;
-
-  (* Convert Hex Long *)
-  PROCEDURE ConvertHL*(x: LONGREAL; VAR d: ARRAY OF CHAR);
-  BEGIN BytesToHex(x, d)
-  END ConvertHL;
-
-END Reals.
diff --git a/src/library/v4/Strings.Mod b/src/library/v4/Strings.Mod
deleted file mode 100644
index e6fe12ac..00000000
--- a/src/library/v4/Strings.Mod
+++ /dev/null
@@ -1,156 +0,0 @@
-(*-------------------------------------------------------------
-Strings provides a set of operations on strings (i.e., on string constants and character
-arrays, both of which contain the character 0X as a terminator). All positions in
-strings start at 0.
-Strings.Length(s)
-  returns the number of characters in s up to and excluding the first 0X.
-Strings.Insert(src, pos, dst)
-  inserts the string src into the string dst at position pos (0 <= pos <= Length(dst)).
-  If pos = Length(dst), src is appended to dst. If the size of dst is not large enough
-  to hold the result of the operation, the result is truncated so that dst is always
-  terminated with a 0X.
-Strings.Append(s, dst)
-  has the same effect as Insert(s, Length(s), dst).
-Strings.Delete(s, pos, n)
-  deletes n characters from s starting at position pos (0 <= pos < Length(s)).
-  If n > Length(s) - pos, the new length of s is pos.
-Strings.Replace(src, pos, dst)
-  has the same effect as Delete(dst, pos, Length(src)) followed by an Insert(src, pos, dst).
-Strings.Extract(src, pos, n, dst)
-  extracts a substring dst with n characters from position pos (0 <= pos < Length(src)) in src.
-  If n > Length(src) - pos, dst is only the part of src from pos to Length(src) - 1. If the size of
-  dst is not large enough to hold the result of the operation, the result is truncated so that
-  dst is always terminated with a 0X.
-Strings.Pos(pat, s, pos)
-  returns the position of the first occurrence of pat in s after position pos (inclusive).
-  If pat is not found, -1 is returned.
-Strings.Cap(s)
-  replaces each lower case letter in s by its upper case equivalent.
--------------------------------------------------------------*)
-(* added from trianus v4 *)
-MODULE Strings;  (*HM 94-06-22 /  *)
-
-
-PROCEDURE Length* (s: ARRAY OF CHAR): INTEGER;
-  VAR i: INTEGER;
-BEGIN
-  i := 0; WHILE (i < LEN(s)) & (s[i] # 0X) DO INC(i) END ;
-  RETURN i
-END Length;
-
-
-PROCEDURE Append* (extra: ARRAY OF CHAR; VAR dest: ARRAY OF CHAR);
-  VAR n1, n2, i: INTEGER;
-BEGIN
-  n1 := Length(dest); n2 := Length(extra); i := 0;
-  WHILE (i < n2) & (i + n1 < LEN(dest)) DO dest[i + n1] := extra[i]; INC(i) END ;
-  IF i + n1 < LEN(dest) THEN dest[i + n1] := 0X END
-END Append;
-
-
-PROCEDURE Insert* (source: ARRAY OF CHAR; pos: INTEGER; VAR dest: ARRAY OF CHAR);
-  VAR n1, n2, i: INTEGER;
-BEGIN
-  n1 := Length(dest); n2 := Length(source);
-  IF pos < 0 THEN pos := 0 END ;
-  IF pos > n1 THEN Append(dest, source); RETURN END ;
-  IF pos + n2 < LEN(dest) THEN  (*make room for source*)
-    i := n1; (*move also 0X if it is there*)
-    WHILE i >= pos DO
-      IF i + n2 < LEN(dest) THEN dest[i + n2] := dest[i] END ;
-      DEC(i)
-    END
-  END ;
-  i := 0; WHILE i < n2 DO dest[pos + i] := source[i]; INC(i) END
-END Insert;
-
-
-PROCEDURE Delete* (VAR s: ARRAY OF CHAR; pos, n: INTEGER);
-  VAR len, i: INTEGER;
-BEGIN
-  len:=Length(s);
-  IF pos < 0 THEN pos:=0 ELSIF pos >= len THEN RETURN END ;
-  IF pos + n < len THEN
-    i:=pos + n; WHILE i < len DO s[i - n]:=s[i]; INC(i) END ;
-    IF i - n < LEN(s) THEN s[i - n]:=0X END
-  ELSE s[pos]:=0X
-  END
-END Delete;
-
-
-PROCEDURE Replace* (source: ARRAY OF CHAR; pos: INTEGER; VAR dest: ARRAY OF CHAR);
-BEGIN
-  Delete(dest, pos, pos + Length(source));
-  Insert(source, pos, dest)
-END Replace;
-
-
-PROCEDURE Extract* (source: ARRAY OF CHAR; pos, n: INTEGER; VAR dest: ARRAY OF CHAR);
-  VAR len, destLen, i: INTEGER;
-BEGIN
-  len := Length(source); destLen := SHORT(LEN(dest)) - 1;
-  IF pos < 0 THEN pos := 0 END ;
-  IF pos >= len THEN dest[0] := 0X; RETURN END ;
-  i := 0;
-  WHILE (pos + i <= LEN(source)) & (source[pos + i] # 0X) & (i < n) DO
-    IF i < destLen THEN dest[i] := source[pos + i] END ;
-    INC(i)
-  END ;
-  dest[i] := 0X
-END Extract;
-
-
-PROCEDURE Pos* (pattern, s: ARRAY OF CHAR; pos: INTEGER): INTEGER;
-  VAR n1, n2, i, j: INTEGER;
-BEGIN
-  n1 := Length(s); n2 := Length(pattern);
-  IF n2 = 0 THEN RETURN 0 END ;
-  i := pos;
-  WHILE i <= n1 - n2 DO
-    IF s[i] = pattern[0] THEN
-      j := 1; WHILE (j < n2) & (s[i + j] = pattern[j]) DO INC(j) END ;
-      IF j = n2 THEN RETURN i END
-    END ;
-    INC(i)
-  END ;
-  RETURN -1
-END Pos;
-
-
-PROCEDURE Cap* (VAR s: ARRAY OF CHAR);
-  VAR i: INTEGER;
-BEGIN
-  i := 0;
-  WHILE s[i] # 0X DO
-    IF ("a" <= s[i]) & (s[i] <= "z") THEN s[i] := CAP(s[i]) END ;
-    INC(i)
-  END
-END Cap;
-
-
-PROCEDURE Match* (string, pattern: ARRAY OF CHAR): BOOLEAN;
-
-  PROCEDURE M (VAR name, mask: ARRAY OF CHAR; n, m: INTEGER): BOOLEAN;
-  BEGIN
-    WHILE (n >= 0) & (m >= 0) & (mask[m] # "*") DO
-      IF name[n] # mask[m] THEN RETURN FALSE END ;
-      DEC(n); DEC(m)
-    END ;
-    (* ----- name empty | mask empty | mask ends with "*" *)
-    IF m < 0 THEN RETURN n < 0 END ;
-    (* ----- name empty | mask ends with "*" *)
-    WHILE (m >= 0) & (mask[m] = "*") DO DEC(m) END ;
-    IF m < 0 THEN RETURN TRUE END ;
-    (* ----- name empty | mask still to be matched *)
-    WHILE n >= 0 DO
-      IF M(name, mask, n, m) THEN RETURN TRUE END ;
-      DEC(n)
-    END ;
-    RETURN FALSE
-  END M;
-
-BEGIN
-  RETURN M(string, pattern, Length(string)-1, Length(pattern)-1)
-END Match;
-
-END Strings.
diff --git a/src/library/v4/Texts.Mod b/src/library/v4/Texts.Mod
deleted file mode 100644
index ecca315d..00000000
--- a/src/library/v4/Texts.Mod
+++ /dev/null
@@ -1,879 +0,0 @@
-MODULE Texts;  (** CAS/HM 23.9.93 -- interface based on Texts by JG/NW 6.12.91**)  (* << RC, MB, JT *)
-  IMPORT
-    Files, Modules, Reals, SYSTEM;
-
-  (*--- insert field e: Elem into Texts.Scanner and change Texts.Scan to set it in case of class=6 *)
-
-
-  CONST
-    Displaywhite = 15;
-    ElemChar* = 1CX;
-    TAB = 9X; CR = 0DX; maxD = 9;
-    (**FileMsg.id**)
-      load* = 0; store* = 1;
-    (**Notifier op**)
-      replace* = 0; insert* = 1; delete* = 2; unmark* = 3;
-    (**Scanner.class**)
-      Inval* = 0; Name* = 1; String* = 2; Int* = 3; Real* = 4; LongReal* = 5; Char* = 6;
-
-    textTag = 0F0X; DocBlockId = 0F7X; version = 01X;
-
-  TYPE
-    FontsFont = POINTER TO FontDesc;
-    FontDesc = RECORD
-      name: ARRAY 32 OF CHAR;
-    END ;
-
-    Run = POINTER TO RunDesc;
-    RunDesc = RECORD
-      prev, next: Run;
-      len: LONGINT;
-      fnt: FontsFont;
-      col, voff: SHORTINT;
-      ascii: BOOLEAN  (* << *)
-    END;
-
-    Piece = POINTER TO PieceDesc;
-    PieceDesc = RECORD (RunDesc)
-      file: Files.File;
-      org: LONGINT
-    END;
-
-    Elem* = POINTER TO ElemDesc;
-    Buffer* = POINTER TO BufDesc;
-    Text* = POINTER TO TextDesc;
-
-    ElemMsg* = RECORD END;
-    Handler* = PROCEDURE (e: Elem; VAR msg: ElemMsg);
-
-    ElemDesc* = RECORD (RunDesc)
-      W*, H*: LONGINT;
-      handle*: Handler;
-      base: Text
-    END;
-
-    FileMsg* = RECORD (ElemMsg)
-      id*: INTEGER;
-      pos*: LONGINT;
-      r*: Files.Rider
-    END;
-
-    CopyMsg* = RECORD (ElemMsg)
-      e*: Elem
-    END;
-
-    IdentifyMsg* = RECORD (ElemMsg)
-      mod*, proc*: ARRAY 32 OF CHAR
-    END;
-
-
-    BufDesc* = RECORD
-      len*: LONGINT;
-      head: Run
-    END;
-
-    Notifier* = PROCEDURE (T: Text; op: INTEGER; beg, end: LONGINT);
-    TextDesc* = RECORD
-      len*: LONGINT;
-      notify*: Notifier;
-      head, cache: Run;
-      corg: LONGINT
-    END;
-
-    Reader* = RECORD
-      eot*: BOOLEAN;
-      fnt*: FontsFont;
-      col*, voff*: SHORTINT;
-      elem*: Elem;
-      rider: Files.Rider;
-      run: Run;
-      org, off: LONGINT
-    END;
-
-    Scanner* = RECORD (Reader)
-      nextCh*: CHAR;
-      line*, class*: INTEGER;
-      i*: LONGINT;
-      x*: REAL;
-      y*: LONGREAL;
-      c*: CHAR;
-      len*: SHORTINT;
-      s*: ARRAY 64 OF CHAR  (* << *)
-    END;
-
-    Writer* = RECORD
-      buf*: Buffer;
-      fnt*: FontsFont;
-      col*, voff*: SHORTINT;
-      rider: Files.Rider;
-      file: Files.File
-    END;
-
-    Alien = POINTER TO RECORD (ElemDesc)
-      file: Files.File;
-      org, span: LONGINT;
-      mod, proc: ARRAY 32 OF CHAR
-    END;
-
-  VAR
-    new*: Elem;
-    del: Buffer;
-    FontsDefault: FontsFont;
-
-
-  PROCEDURE FontsThis(VAR name: ARRAY OF CHAR): FontsFont;
-    VAR F: FontsFont;
-  BEGIN
-    NEW(F); COPY(name, F.name); RETURN F
-  END FontsThis;
-
-  (* run primitives *)
-
-  PROCEDURE Find (T: Text; VAR pos: LONGINT; VAR u: Run; VAR org, off: LONGINT);
-    VAR v: Run; m: LONGINT;
-  BEGIN
-    IF pos >= T.len THEN pos := T.len; u := T.head; org := T.len; off := 0; T.cache := T.head; T.corg := 0
-    ELSE v := T.cache.next; m := pos - T.corg;
-      IF pos >= T.corg THEN
-        WHILE m >= v.len DO DEC(m, v.len); v := v.next END
-      ELSE
-        WHILE m < 0 DO v := v.prev; INC(m, v.len) END;
-      END;
-      u := v; org := pos - m; off := m; T.cache := v.prev; T.corg := org
-    END
-  END Find;
-
-  PROCEDURE Split (off: LONGINT; VAR u, un: Run);
-    VAR p, U: Piece;
-  BEGIN
-    IF off = 0 THEN un := u; u := un.prev
-    ELSIF off >= u.len THEN un := u.next
-    ELSE NEW(p); un := p; U := u(Piece);
-      p^ := U^; INC(p.org, off); DEC(p.len, off); DEC(U.len, p.len);
-      p.ascii := u.ascii; p.prev := U; p.next := U.next; p.next.prev := p; U.next := p  (* << *)
-    END
-  END Split;
-
-  PROCEDURE Merge (T: Text; u: Run; VAR v: Run);
-    VAR p, q: Piece;
-  BEGIN
-    IF (u IS Piece) & (v IS Piece) & (u.fnt.name = v.fnt.name) & (u.col = v.col) & (u.voff = v.voff)
-    & (u(Piece).ascii = v(Piece).ascii) THEN  (* << *)
-      p := u(Piece); q := v(Piece);
-      IF (p.file = q.file) & (p.org + p.len = q.org) THEN
-        IF T.cache = u THEN INC(T.corg, q.len)
-        ELSIF T.cache = v THEN T.cache := T.head; T.corg := 0
-        END;
-        INC(p.len, q.len); v := v.next
-      END
-    END
-  END Merge;
-
-  PROCEDURE Splice (un, v, w: Run; base: Text);  (* (u, un) -> (u, v, w, un) *)
-    VAR u: Run;
-  BEGIN
-    IF v # w.next THEN u := un.prev;
-      u.next := v; v.prev := u; un.prev := w; w.next := un;
-      REPEAT
-        IF v IS Elem THEN v(Elem).base := base END;
-        v := v.next
-      UNTIL v = un
-    END
-  END Splice;
-
-  PROCEDURE ClonePiece (p: Piece): Piece;
-    VAR q: Piece;
-  BEGIN NEW(q); q^ := p^; RETURN q
-  END ClonePiece;
-
-  PROCEDURE CloneElem (e: Elem): Elem;
-    VAR msg: CopyMsg;
-  BEGIN msg.e := NIL; e.handle(e, msg); RETURN msg.e
-  END CloneElem;
-
-
-  (** Elements **)
-
-  PROCEDURE CopyElem* (SE, DE: Elem);
-  BEGIN DE.len := SE.len; DE.fnt := SE.fnt; DE.col := SE.col; DE.voff := SE.voff;
-    DE.W := SE.W; DE.H := SE.H; DE.handle := SE.handle
-  END CopyElem;
-
-  PROCEDURE ElemBase* (E: Elem): Text;
-  BEGIN RETURN E.base
-  END ElemBase;
-
-  PROCEDURE ElemPos* (E: Elem): LONGINT;
-    VAR u: Run; pos: LONGINT;
-  BEGIN u := E.base.head.next; pos := 0;
-    WHILE u # E DO pos := pos + u.len; u := u.next END;
-    RETURN pos
-  END ElemPos;
-
-
-  PROCEDURE HandleAlien (E: Elem; VAR msg: ElemMsg);
-    VAR e: Alien; r: Files.Rider; i: LONGINT; ch: CHAR;
-  BEGIN
-    WITH E: Alien DO
-      IF msg IS CopyMsg THEN
-        WITH msg: CopyMsg DO NEW(e); CopyElem(E, e);
-          e.file := E.file; e.org := E.org; e.span := E.span; e.mod := E.mod; e.proc := E.proc;
-          msg.e := e
-        END
-      ELSIF msg IS IdentifyMsg THEN
-        WITH msg: IdentifyMsg DO
-          COPY(E.mod, msg.mod); COPY(E.proc, msg.proc); msg.mod[31] := 1X (*alien*)
-        END
-      ELSIF msg IS FileMsg THEN
-        WITH msg: FileMsg DO
-          IF msg.id = store THEN Files.Set(r, E.file, E.org); i := E.span;
-            WHILE i > 0 DO Files.Read(r, ch); Files.Write(msg.r, ch); DEC(i) END
-          END
-        END
-      END
-    END
-  END HandleAlien;
-
-
-  (** Buffers **)
-
-  PROCEDURE OpenBuf* (B: Buffer);
-    VAR u: Run;
-  BEGIN NEW(u); u.next := u; u.prev := u; B.head := u; B.len := 0
-  END OpenBuf;
-
-  PROCEDURE Copy* (SB, DB: Buffer);
-    VAR u, v, vn: Run;
-  BEGIN u := SB.head.next; v := DB.head.prev;
-    WHILE u # SB.head DO
-      IF u IS Piece THEN vn := ClonePiece(u(Piece)) ELSE vn := CloneElem(u(Elem)) END;
-      v.next := vn; vn.prev := v; v := vn; u := u.next
-    END;
-    v.next := DB.head; DB.head.prev := v;
-    INC(DB.len, SB.len)
-  END Copy;
-
-  PROCEDURE Recall* (VAR B: Buffer);
-  BEGIN B := del; del := NIL
-  END Recall;
-
-
-  (** Texts **)
-
-  PROCEDURE Save* (T: Text; beg, end: LONGINT; B: Buffer);
-    VAR u, v, w, wn: Run; uo, ud, vo, vd: LONGINT;
-  BEGIN Find(T, beg, u, uo, ud); Find(T, end, v, vo, vd);
-    w := B.head.prev;
-    WHILE u # v DO
-      IF u IS Piece THEN wn := ClonePiece(u(Piece)); DEC(wn.len, ud); INC(wn(Piece).org, ud)
-      ELSE wn := CloneElem(u(Elem))
-      END;
-      w.next := wn; wn.prev := w; w := wn; u := u.next; ud := 0
-    END;
-    IF vd > 0 THEN (*v IS Piece*) wn := ClonePiece(v(Piece)); wn.len := vd - ud; INC(wn(Piece).org, ud);
-      w.next := wn; wn.prev := w; w := wn
-    END;
-    w.next := B.head; B.head.prev := w;
-    INC(B.len, end - beg)
-  END Save;
-
-  PROCEDURE Insert* (T: Text; pos: LONGINT; B: Buffer);
-    VAR u, un, v: Run; p, q: Piece; uo, ud, len: LONGINT;
-  BEGIN Find(T, pos, u, uo, ud); Split(ud, u, un);
-    len := B.len; v := B.head.next;
-    Merge(T, u, v); Splice(un, v, B.head.prev, T);
-    INC(T.len, len); B.head.next := B.head; B.head.prev := B.head; B.len := 0;
-    IF T.notify # NIL THEN T.notify(T, insert, pos, pos+len) END
-  END Insert;
-
-  PROCEDURE Append* (T: Text; B: Buffer);
-    VAR v: Run; pos, len: LONGINT;
-  BEGIN pos := T.len; len := B.len; v := B.head.next;
-    Merge(T, T.head.prev, v); Splice(T.head, v, B.head.prev, T);
-    INC(T.len, len); B.head.next := B.head; B.head.prev := B.head; B.len := 0;
-    IF T.notify # NIL THEN T.notify(T, insert, pos, pos+len) END
-  END Append;
-
-  PROCEDURE Delete* (T: Text; beg, end: LONGINT);
-    VAR c, u, un, v, vn: Run; co, uo, ud, vo, vd: LONGINT;
-  BEGIN
-    Find(T, beg, u, uo, ud); Split(ud, u, un); c := T.cache; co := T.corg;
-    Find(T, end, v, vo, vd); Split(vd, v, vn); T.cache := c; T.corg := co;
-    NEW(del); OpenBuf(del); del.len := end - beg;
-    Splice(del.head, un, v, NIL);
-    Merge(T, u, vn); u.next := vn; vn.prev := u;
-    DEC(T.len, end - beg);
-    IF T.notify # NIL THEN T.notify(T, delete, beg, end) END
-  END Delete;
-
-  PROCEDURE ChangeLooks* (T: Text; beg, end: LONGINT; sel: SET; fnt: FontsFont; col, voff: SHORTINT);
-    VAR c, u, un, v, vn: Run; co, uo, ud, vo, vd: LONGINT;
-  BEGIN Find(T, beg, u, uo, ud); Split(ud, u, un); c := T.cache; co := T.corg;
-    Find(T, end, v, vo, vd); Split(vd, v, vn); T.cache := c; T.corg := co;
-    WHILE un # vn DO
-      IF (0 IN sel) & (fnt # NIL) THEN un.fnt := fnt END;
-      IF 1 IN sel THEN un.col := col END;
-      IF 2 IN sel THEN un.voff := voff END;
-      Merge(T, u, un);
-      IF u.next = un THEN u := un; un := un.next ELSE u.next := un; un.prev := u END
-    END;
-    Merge(T, u, un); u.next := un; un.prev := u;
-    IF T.notify # NIL THEN T.notify(T, replace, beg, end) END
-  END ChangeLooks;
-
-
-  (** Readers **)
-
-  PROCEDURE OpenReader* (VAR R: Reader; T: Text; pos: LONGINT);
-    VAR u: Run;
-  BEGIN
-    IF pos >= T.len THEN pos := T.len END;
-    Find(T, pos, u, R.org, R.off); R.run := u; R.eot := FALSE;
-    IF u IS Piece THEN
-      Files.Set(R.rider, u(Piece).file, u(Piece).org + R.off)
-    END
-  END OpenReader;
-
-  PROCEDURE Read* (VAR R: Reader; VAR ch: CHAR);
-    VAR u: Run; pos: LONGINT; nextch: CHAR;
-  BEGIN u := R.run; R.fnt := u.fnt; R.col := u.col; R.voff := u.voff; INC(R.off);
-    IF u IS Piece THEN Files.Read(R.rider, ch); R.elem := NIL;
-      IF (ch = 0AX) & u(Piece).ascii THEN ch := CR (* << LF to CR *)
-      ELSIF (ch = CR) & u(Piece).ascii THEN (* << CR LF to CR *)
-         pos := Files.Pos(R.rider); Files.Read(R.rider, nextch);
-	 IF nextch = 0AX THEN INC(R.off) ELSE Files.Set(R.rider, u(Piece).file, pos) END
-      END
-    ELSIF u IS Elem THEN ch := ElemChar; R.elem := u(Elem)
-    ELSE ch := 0X; R.elem := NIL; R.eot := TRUE
-    END;
-    IF R.off = u.len THEN INC(R.org, u.len); u := u.next;
-      IF u IS Piece THEN
-        WITH u: Piece DO Files.Set(R.rider, u.file, u.org) END
-      END;
-      R.run := u; R.off := 0
-    END
-  END Read;
-
-  PROCEDURE ReadElem* (VAR R: Reader);
-    VAR u, un: Run;
-  BEGIN u := R.run;
-    WHILE u IS Piece DO INC(R.org, u.len); u := u.next END;
-    IF u IS Elem THEN un := u.next; R.run := un; INC(R.org); R.off := 0;
-      R.fnt := u.fnt; R.col := u.col; R.voff := u.voff; R.elem := u(Elem);
-      IF un IS Piece THEN
-        WITH un: Piece DO Files.Set(R.rider, un.file, un.org) END
-      END
-    ELSE R.eot := TRUE; R.elem := NIL
-    END
-  END ReadElem;
-
-  PROCEDURE ReadPrevElem* (VAR R: Reader);
-    VAR u: Run;
-  BEGIN u := R.run.prev;
-    WHILE u IS Piece DO DEC(R.org, u.len); u := u.prev END;
-    IF u IS Elem THEN R.run := u; DEC(R.org); R.off := 0;
-      R.fnt := u.fnt; R.col := u.col; R.voff := u.voff; R.elem := u(Elem)
-    ELSE R.eot := TRUE; R.elem := NIL
-    END
-  END ReadPrevElem;
-
-  PROCEDURE Pos* (VAR R: Reader): LONGINT;
-  BEGIN RETURN R.org + R.off
-  END Pos;
-
-
-  (** Scanners --------------- NW --------------- **)
-
-  PROCEDURE OpenScanner* (VAR S: Scanner; T: Text; pos: LONGINT);
-  BEGIN OpenReader(S, T, pos); S.line := 0; S.nextCh := " "
-  END OpenScanner;
-
-  (*IEEE floating point formats:
-    x = 2^(e-127) * 1.m    bit 0: sign, bits 1- 8: e, bits  9-31: m
-    x = 2^(e-1023) * 1.m   bit 0: sign, bits 1-11: e, bits 12-63: m *)
-
-  PROCEDURE Scan* (VAR S: Scanner);
-    CONST maxD = 32;
-    VAR ch, term: CHAR;
-      neg, negE, hex: BOOLEAN;
-      i, j, h: SHORTINT;
-      e: INTEGER; k: LONGINT;
-      x, f: REAL; y, g: LONGREAL;
-      d: ARRAY maxD OF CHAR;
-
-    PROCEDURE ReadScaleFactor;
-    BEGIN Read(S, ch);
-      IF ch = "-" THEN negE := TRUE; Read(S, ch)
-      ELSE negE := FALSE;
-        IF ch = "+" THEN Read(S, ch) END
-      END;
-      WHILE ("0" <= ch) & (ch <= "9") DO
-        e := e*10 + ORD(ch) - 30H; Read(S, ch)
-      END
-    END ReadScaleFactor;
-
-  BEGIN ch := S.nextCh; i := 0;
-    LOOP
-      IF ch = CR THEN INC(S.line)
-      ELSIF (ch # " ") & (ch # TAB) THEN EXIT
-      END ;
-      Read(S, ch)
-    END;
-    IF ("A" <= CAP(ch)) & (CAP(ch) <= "Z") OR (ch = "/") OR (ch = ".") THEN (*name*)  (* << *)
-      REPEAT S.s[i] := ch; INC(i); Read(S, ch)
-      UNTIL (CAP(ch) > "Z") & (ch # "_")  (* << *)
-        OR ("A" > CAP(ch)) & (ch > "9")
-        OR ("0" > ch) & (ch # ".") & (ch # "/")  (* << *)
-        OR (i = 63);  (* << *)
-      S.s[i] := 0X; S.len := i; S.class := 1
-    ELSIF ch = 22X THEN (*literal string*)
-      Read(S, ch);
-      WHILE (ch # 22X) & (ch >= " ") & (i # 63) DO  (* << *)
-        S.s[i] := ch; INC(i); Read(S, ch)
-      END;
-      S.s[i] := 0X; S.len := i+1; Read(S, ch); S.class := 2
-    ELSE
-      IF ch = "-" THEN neg := TRUE; Read(S, ch) ELSE neg := FALSE END ;
-      IF ("0" <= ch) & (ch <= "9") THEN (*number*)
-        hex := FALSE; j := 0;
-        LOOP d[i] := ch; INC(i); Read(S, ch);
-          IF ch < "0" THEN EXIT END;
-          IF "9" < ch THEN
-            IF ("A" <= ch) & (ch <= "F") THEN hex := TRUE; ch := CHR(ORD(ch)-7)
-            ELSIF ("a" <= ch) & (ch <= "f") THEN hex := TRUE; ch := CHR(ORD(ch)-27H)
-            ELSE EXIT
-            END
-          END
-        END;
-        IF ch = "H" THEN (*hex number*)
-          Read(S, ch); S.class := 3;
-          IF i-j > 8 THEN j := i-8 END ;
-          k := ORD(d[j]) - 30H; INC(j);
-          IF (i-j = 7) & (k >= 8) THEN DEC(k, 16) END ;
-          WHILE j < i DO k := k*10H + (ORD(d[j]) - 30H); INC(j) END ;
-          IF neg THEN S.i := -k ELSE S.i := k END
-        ELSIF ch = "." THEN (*read real*)
-          Read(S, ch); h := i;
-          WHILE ("0" <= ch) & (ch <= "9") DO d[i] := ch; INC(i); Read(S, ch) END ;
-          IF ch = "D" THEN
-            e := 0; y := 0; g := 1;
-            REPEAT y := y*10 + (ORD(d[j]) - 30H); INC(j) UNTIL j = h;
-            WHILE j < i DO g := g/10; y := (ORD(d[j]) - 30H)*g + y; INC(j) END ;
-            ReadScaleFactor;
-            IF negE THEN
-              IF e <= 308 THEN y := y / Reals.TenL(e) ELSE y := 0 END
-            ELSIF e > 0 THEN
-              IF e <= 308 THEN y := Reals.TenL(e) * y ELSE HALT(40) END
-            END ;
-            IF neg THEN y := -y END ;
-            S.class := 5; S.y := y
-          ELSE e := 0; x := 0; f := 1;
-            REPEAT x := x*10 + (ORD(d[j]) - 30H); INC(j) UNTIL j = h;
-            WHILE j < i DO f := f/10; x := (ORD(d[j])-30H)*f + x; INC(j) END;
-            IF ch = "E" THEN ReadScaleFactor END ;
-            IF negE THEN
-              IF e <= 38 THEN x := x / Reals.Ten(e) ELSE x := 0 END
-            ELSIF e > 0 THEN
-              IF e <= 38 THEN x := Reals.Ten(e) * x ELSE HALT(40) END
-            END ;
-            IF neg THEN x := -x END ;
-            S.class := 4; S.x := x
-          END ;
-          IF hex THEN S.class := 0 END
-        ELSE (*decimal integer*)
-          S.class := 3; k := 0;
-          REPEAT k := k*10 + (ORD(d[j]) - 30H); INC(j) UNTIL j = i;
-          IF neg THEN S.i := -k ELSE S.i := k END;
-          IF hex THEN S.class := 0 ELSE S.class := 3 END
-        END
-      ELSE S.class := 6;
-        IF neg THEN S.c := "-" ELSE S.c := ch; Read(S, ch) END
-      END
-    END;
-    S.nextCh := ch
-  END Scan;
-
-
-  (** Writers **)
-
-  PROCEDURE OpenWriter* (VAR W: Writer);
-  BEGIN NEW(W.buf); OpenBuf(W.buf);
-    W.fnt := FontsDefault; W.col := Displaywhite; W.voff := 0;
-    W.file := Files.New(""); Files.Set(W.rider, W.file, 0)
-  END OpenWriter;
-
-  PROCEDURE SetFont* (VAR W: Writer; fnt: FontsFont);
-  BEGIN W.fnt := fnt
-  END SetFont;
-
-  PROCEDURE SetColor* (VAR W: Writer; col: SHORTINT);
-  BEGIN W.col := col
-  END SetColor;
-
-  PROCEDURE SetOffset* (VAR W: Writer; voff: SHORTINT);
-  BEGIN W.voff := voff
-  END SetOffset;
-
-
-  PROCEDURE Write* (VAR W: Writer; ch: CHAR);
-    VAR u, un: Run; p: Piece;
-  BEGIN Files.Write(W.rider, ch); INC(W.buf.len); un := W.buf.head; u := un.prev;
-    IF (u IS Piece) & (u(Piece).file = W.file) & (u.fnt.name = W.fnt.name) & (u.col = W.col) & (u.voff = W.voff)
-    & ~u(Piece).ascii THEN (* << *)
-      INC(u.len)
-    ELSE NEW(p); u.next := p; p.prev := u; p.next := un; un.prev := p;
-      p.len := 1; p.fnt := W.fnt; p.col := W.col; p.voff := W.voff;
-      p.file := W.file; p.org := Files.Length(W.file) - 1; p.ascii := FALSE (* << *)
-    END
-  END Write;
-
-  PROCEDURE WriteElem* (VAR W: Writer; e: Elem);
-    VAR u, un: Run;
-  BEGIN
-    IF e.base # NIL THEN HALT(99) END;
-    INC(W.buf.len); e.len := 1; e.fnt := W.fnt; e.col := W.col; e.voff := W.voff;
-    un := W.buf.head; u := un.prev; u.next := e; e.prev := u; e.next := un; un.prev := e
-  END WriteElem;
-
-  PROCEDURE WriteLn* (VAR W: Writer);
-  BEGIN Write(W, CR)
-  END WriteLn;
-
-  PROCEDURE WriteString* (VAR W: Writer; s: ARRAY OF CHAR);
-    VAR i: INTEGER;
-  BEGIN i := 0;
-    WHILE s[i] >= " " DO Write(W, s[i]); INC(i) END
-  END WriteString;
-
-  PROCEDURE WriteInt* (VAR W: Writer; x, n: SYSTEM.INT64);
-  VAR
-    i: INTEGER; x0: SYSTEM.INT64;
-    a: ARRAY 24 OF CHAR;
-  BEGIN i := 0;
-    IF x < 0 THEN
-      IF x = MIN(SYSTEM.INT64) THEN WriteString(W, " -9223372036854775808"); RETURN
-      ELSE DEC(n); x0 := -x
-      END
-    ELSE x0 := x
-    END;
-    REPEAT
-      a[i] := CHR(x0 MOD 10 + 30H); x0 := x0 DIV 10; INC(i)
-    UNTIL x0 = 0;
-    WHILE n > i DO Write(W, " "); DEC(n) END;
-    IF x < 0 THEN Write(W, "-") END;
-    REPEAT DEC(i); Write(W, a[i]) UNTIL i = 0
-  END WriteInt;
-
-  PROCEDURE WriteHex* (VAR W: Writer; x: LONGINT);
-    VAR i: INTEGER; y: LONGINT;
-      a: ARRAY 20 OF CHAR;
-  BEGIN i := 0; Write(W, " ");
-    REPEAT y := x MOD 10H;
-      IF y < 10 THEN a[i] := CHR(y + 30H) ELSE a[i] := CHR(y + 37H) END;
-      x := x DIV 10H; INC(i)
-    UNTIL i = 8;
-    REPEAT DEC(i); Write(W, a[i]) UNTIL i = 0
-  END WriteHex;
-
-  PROCEDURE WriteReal* (VAR W: Writer; x: REAL; n: INTEGER);
-    VAR e: INTEGER; x0: REAL;
-      d: ARRAY maxD OF CHAR;
-  BEGIN e := Reals.Expo(x);
-    IF e = 0 THEN
-      WriteString(W, "  0");
-      REPEAT Write(W, " "); DEC(n) UNTIL n <= 3
-    ELSIF e = 255 THEN
-      WriteString(W, " NaN");
-      WHILE n > 4 DO Write(W, " "); DEC(n) END
-    ELSE
-      IF n <= 9 THEN n := 3 ELSE DEC(n, 6) END;
-      REPEAT Write(W, " "); DEC(n) UNTIL n <= 8;
-      (*there are 2 < n <= 8 digits to be written*)
-      IF x < 0.0 THEN Write(W, "-"); x := -x ELSE Write(W, " ") END;
-      e := (e - 127) * 77  DIV 256;
-      IF e >= 0 THEN x := x / Reals.Ten(e) ELSE x := Reals.Ten(-e) * x END;
-      IF x >= 10.0 THEN x := 0.1*x; INC(e) END;
-      x0 := Reals.Ten(n-1); x := x0*x + 0.5;
-      IF x >= 10.0*x0 THEN x := x*0.1; INC(e) END;
-      Reals.Convert(x, n, d);
-      DEC(n); Write(W, d[n]); Write(W, ".");
-      REPEAT DEC(n); Write(W, d[n]) UNTIL n = 0;
-      Write(W, "E");
-      IF e < 0 THEN Write(W, "-"); e := -e ELSE Write(W, "+") END;
-      Write(W, CHR(e DIV 10 + 30H)); Write(W, CHR(e MOD 10 + 30H))
-    END
-  END WriteReal;
-
-  PROCEDURE WriteRealFix* (VAR W: Writer; x: REAL; n, k: INTEGER);
-    VAR e, i: INTEGER; sign: CHAR; x0: REAL;
-      d: ARRAY maxD OF CHAR;
-
-    PROCEDURE seq(ch: CHAR; n: INTEGER);
-    BEGIN WHILE n > 0 DO Write(W, ch); DEC(n) END
-    END seq;
-
-    PROCEDURE dig(n: INTEGER);
-    BEGIN
-      WHILE n > 0 DO
-        DEC(i); Write(W, d[i]); DEC(n)
-      END
-    END dig;
-
-  BEGIN e := Reals.Expo(x);
-    IF k < 0 THEN k := 0 END;
-    IF e = 0 THEN seq(" ", n-k-2); Write(W, "0"); seq(" ", k+1)
-    ELSIF e = 255 THEN WriteString(W, " NaN"); seq(" ", n-4)
-    ELSE e := (e - 127) * 77 DIV 256;
-      IF x < 0 THEN sign := "-"; x := -x ELSE sign := " " END;
-      IF e >= 0 THEN  (*x >= 1.0,  77/256 = log 2*) x := x/Reals.Ten(e)
-        ELSE (*x < 1.0*) x := Reals.Ten(-e) * x
-      END;
-      IF x >= 10.0 THEN x := 0.1*x; INC(e) END;
-      (* 1 <= x < 10 *)
-      IF k+e >= maxD-1 THEN k := maxD-1-e
-        ELSIF k+e < 0 THEN k := -e; x := 0.0
-      END;
-      x0 := Reals.Ten(k+e); x := x0*x + 0.5;
-      IF x >= 10.0*x0 THEN INC(e) END;
-      (*e = no. of digits before decimal point*)
-      INC(e); i := k+e; Reals.Convert(x, i, d);
-      IF e > 0 THEN
-        seq(" ", n-e-k-2); Write(W, sign); dig(e);
-        Write(W, "."); dig(k)
-      ELSE seq(" ", n-k-3);
-        Write(W, sign); Write(W, "0"); Write(W, ".");
-        seq("0", -e); dig(k+e)
-      END
-    END
-  END WriteRealFix;
-
-  PROCEDURE WriteRealHex* (VAR W: Writer; x: REAL);
-    VAR i: INTEGER;
-      d: ARRAY 8 OF CHAR;
-  BEGIN Reals.ConvertH(x, d); i := 0;
-    REPEAT Write(W, d[i]); INC(i) UNTIL i = 8
-  END WriteRealHex;
-
-  PROCEDURE WriteLongReal* (VAR W: Writer; x: LONGREAL; n: INTEGER);
-    CONST maxD = 16;
-    VAR e: INTEGER; x0: LONGREAL;
-      d: ARRAY maxD OF CHAR;
-  BEGIN e := Reals.ExpoL(x);
-    IF e = 0 THEN
-      WriteString(W, "  0");
-      REPEAT Write(W, " "); DEC(n) UNTIL n <= 3
-    ELSIF e = 2047 THEN
-      WriteString(W, " NaN");
-      WHILE n > 4 DO Write(W, " "); DEC(n) END
-    ELSE
-      IF n <= 10 THEN n := 3 ELSE DEC(n, 7) END;
-      REPEAT Write(W, " "); DEC(n) UNTIL n <= maxD;
-      (*there are 2 <= n <= maxD digits to be written*)
-      IF x < 0 THEN Write(W, "-"); x := -x ELSE Write(W, " ") END;
-
-      (* Scale e to be an exponent of 10 rather than 2 *)
-      e := SHORT(LONG(e - 1023) * 77 DIV 256);
-      IF e >= 0 THEN x := x / Reals.TenL(e) ELSE x := Reals.TenL(-e) * x END ;
-      IF x >= 10.0D0 THEN x := 0.1D0 * x; INC(e) END;
-
-      (* Scale x to the number of digits requested *)
-      x0 := Reals.TenL(n-1); x := x0*x + 0.5D0;
-      IF x >= 10.0D0*x0 THEN x := 0.1D0 * x; INC(e) END ;
-
-      (* Generate the mantissa digits of x *)
-      Reals.ConvertL(x, n, d);
-
-      DEC(n); Write(W, d[n]); Write(W, ".");
-      REPEAT DEC(n); Write(W, d[n]) UNTIL n = 0;
-
-      Write(W, "D");
-      IF e < 0 THEN Write(W, "-"); e := -e ELSE Write(W, "+") END;
-      Write(W, CHR(e DIV 100 + 30H)); e := e MOD 100;
-      Write(W, CHR(e DIV 10 + 30H));
-      Write(W, CHR(e MOD 10 + 30H))
-    END
-  END WriteLongReal;
-
-  PROCEDURE WriteLongRealHex* (VAR W: Writer; x: LONGREAL);
-    VAR i: INTEGER;
-      d: ARRAY 16 OF CHAR;
-  BEGIN Reals.ConvertHL(x, d); i := 0;
-    REPEAT Write(W, d[i]); INC(i) UNTIL i = 16
-  END WriteLongRealHex;
-
-  PROCEDURE WriteDate* (VAR W: Writer; t, d: LONGINT);
-
-    PROCEDURE WritePair(ch: CHAR; x: LONGINT);
-    BEGIN Write(W, ch);
-      Write(W, CHR(x DIV 10 + 30H)); Write(W, CHR(x MOD 10 + 30H))
-    END WritePair;
-
-  BEGIN
-    WritePair(" ", d MOD 32); WritePair(".", d DIV 32 MOD 16); WritePair(".", d DIV 512 MOD 128);
-    WritePair(" ", t DIV 4096 MOD 32); WritePair(":", t DIV 64 MOD 64); WritePair(":", t MOD 64)
-  END WriteDate;
-
-
-  (** Text Filing **)
-
-  PROCEDURE Load0 (VAR r: Files.Rider; T: Text);
-    VAR u, un: Run; p: Piece; e: Elem;
-      org, pos, hlen, plen: LONGINT; ecnt, fno, fcnt, col, voff: SHORTINT;
-      f: Files.File;
-      msg: FileMsg;
-      mods, procs: ARRAY 64, 32 OF CHAR;
-      name: ARRAY 32 OF CHAR;
-      fnts: ARRAY 32 OF FontsFont;
-
-    PROCEDURE LoadElem (VAR r: Files.Rider; pos, span: LONGINT; VAR e: Elem);
-      VAR M: Modules.Module; Cmd: Modules.Command; a: Alien;
-        org, ew, eh: LONGINT; eno: SHORTINT;
-    BEGIN new := NIL;
-      Files.ReadLInt(r, ew); Files.ReadLInt(r, eh); Files.Read(r, eno);
-      IF eno > ecnt THEN ecnt := eno; Files.ReadString(r, mods[eno]); Files.ReadString(r, procs[eno]) END;
-      org := Files.Pos(r); M := Modules.ThisMod(mods[eno]);
-      IF M # NIL THEN Cmd := Modules.ThisCommand(M, procs[eno]);
-        IF Cmd # NIL THEN Cmd END
-      END;
-      e := new;
-      IF e # NIL THEN e.W := ew; e.H := eh; e.base := T;
-        msg.pos := pos; e.handle(e, msg);
-        IF Files.Pos(r) # org + span THEN e := NIL END
-      END;
-      IF e = NIL THEN Files.Set(r, f, org + span);
-        NEW(a); a.W := ew; a.H := eh; a.handle := HandleAlien; a.base := T;
-        a.file := f; a.org := org; a.span := span;
-        COPY(mods[eno], a.mod); COPY(procs[eno], a.proc);
-        e := a
-      END
-    END LoadElem;
-
-  BEGIN pos := Files.Pos(r); f := Files.Base(r);
-    NEW(u); u.len := MAX(LONGINT); (*u.fnt := FontsDefault;*)u.fnt := NIL; u.col := Displaywhite;
-    T.head := u; ecnt := 0; fcnt := 0;
-    msg.id := load; msg.r := r;
-    Files.ReadLInt(msg.r, hlen); (*!!!org := pos + hlen;*) org := pos -2 + hlen; pos := org; Files.Read(msg.r, fno);
-    WHILE fno # 0 DO
-      IF fno > fcnt THEN fcnt := fno; Files.ReadString(msg.r, name); fnts[fno] := FontsThis(name) END;
-      Files.Read(msg.r, col); Files.Read(msg.r, voff); Files.ReadLInt(msg.r, plen);
-      IF plen > 0 THEN NEW(p); p.file := f; p.org := pos; p.ascii := FALSE; un := p; un.len := plen
-      ELSE LoadElem(msg.r, pos - org, -plen, e); un := e; un.len := 1
-      END;
-      (*un.fnt := fnts[fno];*) un.col := col; un.voff := voff;
-      INC(pos, un.len); u.next := un; un.prev := u; u := un; Files.Read(msg.r, fno)
-    END;
-    u.next := T.head; T.head.prev := u; T.cache := T.head; T.corg := 0;
-    Files.ReadLInt(msg.r, T.len); Files.Set(r, f, Files.Pos(msg.r) + T.len)
-  END Load0;
-
-  PROCEDURE Load* (VAR r: Files.Rider; T: Text);
-    CONST oldTag = -4095;
-    VAR tag: INTEGER;
-  BEGIN
-    (* for compatibility inner text tags are checked and skipped; remove this in a later version *)
-    Files.ReadInt(r, tag); IF tag # oldTag THEN Files.Set(r, Files.Base(r), Files.Pos(r)-2) END;
-    Load0(r, T)
-  END Load;
-
-  PROCEDURE Open* (T: Text; name: ARRAY OF CHAR);
-    VAR f: Files.File; r: Files.Rider; u: Run; p: Piece; tag, version: CHAR; hlen: LONGINT;
-  BEGIN f := Files.Old(name);
-    IF f = NIL THEN f := Files.New("") END;
-    Files.Set(r, f, 0); Files.Read(r, tag); Files.Read(r, version);
-    IF (tag = textTag) OR (tag = 01X) & (version = textTag) THEN Load0(r, T)
-    ELSE (*ascii*)
-      NEW(u); u.len := MAX(LONGINT); u.fnt := NIL; u.col := Displaywhite;
-      NEW(p);
-      IF (tag = DocBlockId) & (version = 07X) THEN (* extract ascii text from System 3 text document *)
-        Files.Set(r, f, 28); Files.ReadLInt(r, hlen);
-        Files.Set(r, f, 22 + hlen); Files.ReadLInt(r, T.len); p.org := 26 + hlen
-      ELSE
-        T.len := Files.Length(f); p.org := 0
-      END ;
-      IF T.len > 0 THEN p.len := T.len; p.fnt := FontsDefault;
-        p.col := Displaywhite; p.voff := 0; p.file := f; p.ascii := TRUE;
-        u.next := p; u.prev := p; p.next := u; p.prev := u
-      ELSE u.next := u; u.prev := u
-      END;
-      T.head := u; T.cache := T.head; T.corg := 0
-    END
-  END Open;
-
-  PROCEDURE Store* (VAR r: Files.Rider; T: Text);
-    VAR r1: Files.Rider; u, un: Run; e: Elem; org, pos, delta, hlen, rlen: LONGINT; ecnt, fno, fcnt: SHORTINT; ch: CHAR;  (* << *)
-      msg: FileMsg; iden: IdentifyMsg;
-      mods, procs: ARRAY 64, 32 OF CHAR;
-      fnts: ARRAY 32 OF FontsFont;
-      block: ARRAY 1024 OF CHAR;
-
-    PROCEDURE StoreElem (VAR r: Files.Rider; pos: LONGINT; e: Elem);
-      VAR r1: Files.Rider; org, span: LONGINT; eno: SHORTINT;
-    BEGIN COPY(iden.mod, mods[ecnt]); COPY(iden.proc, procs[ecnt]); eno := 1;
-      WHILE (mods[eno] # iden.mod) OR (procs[eno] # iden.proc) DO INC(eno) END;
-      Files.Set(r1, Files.Base(r), Files.Pos(r));
-      Files.WriteLInt(r, 0); Files.WriteLInt(r, 0); Files.WriteLInt(r, 0); (*fixup slot*)
-      Files.Write(r, eno);
-      IF eno = ecnt THEN INC(ecnt); Files.WriteString(r, iden.mod); Files.WriteString(r, iden.proc) END;
-      msg.pos := pos; org := Files.Pos(r); e.handle(e, msg); span := Files.Pos(r) - org;
-      Files.WriteLInt(r1, -span); Files.WriteLInt(r1, e.W); Files.WriteLInt(r1, e.H) (*fixup*)
-    END StoreElem;
-
-  BEGIN
-    org := Files.Pos(r); msg.id := store; msg.r := r; Files.WriteLInt(msg.r, 0); (*fixup slot*)
-    u := T.head.next; pos := 0; delta := 0; fcnt := 1; ecnt := 1;
-    WHILE u # T.head DO
-      IF u IS Elem THEN iden.mod[0] := 0X; u(Elem).handle(u(Elem), iden) ELSE iden.mod[0] := 1X END;
-      IF iden.mod[0] # 0X THEN
-        fnts[fcnt] := u.fnt; fno := 1;
-        WHILE fnts[fno].name # u.fnt.name DO INC(fno) END;
-        Files.Write(msg.r, fno);
-        IF fno = fcnt THEN INC(fcnt); Files.WriteString(msg.r, u.fnt.name) END;
-        Files.Write(msg.r, u.col); Files.Write(msg.r, u.voff)
-      END;
-      IF u IS Piece THEN rlen := u.len; un := u.next;
-        WHILE (un IS Piece) & (un.fnt = u.fnt) & (un.col = u.col) & (un.voff = u.voff) DO
-          INC(rlen, un.len); un := un.next
-        END;
-        Files.WriteLInt(msg.r, rlen); INC(pos, rlen); u := un
-      ELSIF iden.mod[0] # 0X THEN StoreElem(msg.r, pos, u(Elem)); INC(pos); u := u.next
-      ELSE INC(delta); u := u.next
-      END
-    END;
-    Files.Write(msg.r, 0); Files.WriteLInt(msg.r, T.len - delta);
-    (*!!!hlen := Files.Pos(msg.r) - org;*) hlen := Files.Pos(msg.r) - org + 2;
-    Files.Set(r1, Files.Base(msg.r), org); Files.WriteLInt(r1, hlen); (*fixup*)
-    u := T.head.next;
-    WHILE u # T.head DO
-      IF u IS Piece THEN
-        WITH u: Piece DO
-          IF u.ascii THEN Files.Set(r1, u.file, u.org); delta := u.len;  (* << LF to CR *)
-            WHILE delta > 0 DO Files.Read(r1, ch); DEC(delta);
-              IF ch = 0AX THEN Files.Write(msg.r, CR) ELSE Files.Write(msg.r, ch) END
-            END
-          ELSE Files.Set(r1, u.file, u.org); delta := u.len;
-            WHILE delta > LEN(block) DO Files.ReadBytes(r1, block, LEN(block));
-              Files.WriteBytes(msg.r, block, LEN(block)); DEC(delta, LEN(block))
-            END;
-            Files.ReadBytes(r1, block, delta); Files.WriteBytes(msg.r, block, delta)
-          END
-        END
-      ELSE iden.mod[0] := 0X; u(Elem).handle(u(Elem), iden);
-        IF iden.mod[0] # 0X THEN Files.Write(msg.r, ElemChar) END
-      END;
-      u := u.next
-    END;
-    r := msg.r;
-    IF T.notify # NIL THEN T.notify(T, unmark, 0, 0) END
-  END Store;
-
-  PROCEDURE Close* (T: Text; name: ARRAY OF CHAR);
-    VAR f: Files.File; r: Files.Rider; i, res: INTEGER; bak: ARRAY 64 OF CHAR;
-  BEGIN
-    f := Files.New(name); Files.Set(r, f, 0); Files.Write(r, textTag); Files.Write(r, version); Store(r, T);
-    i := 0; WHILE name[i] # 0X DO INC(i) END;
-    COPY(name, bak); bak[i] := "."; bak[i+1] := "B"; bak[i+2] := "a"; bak[i+3] := "k"; bak[i+4] := 0X;
-    Files.Rename(name, bak, res); Files.Register(f)
-  END Close;
-
-BEGIN del := NIL; NEW(FontsDefault); FontsDefault.name := "Syntax10.Scn.Fnt"
-END Texts.
diff --git a/src/runtime/Files.Mod b/src/runtime/Files.Mod
index 40307644..841c5c41 100644
--- a/src/runtime/Files.Mod
+++ b/src/runtime/Files.Mod
@@ -642,19 +642,12 @@ Especially Length would become fairly complex.
   END ReadString;
 
   PROCEDURE ReadLine* (VAR R: Rider; VAR x: ARRAY OF CHAR);
-    VAR i: INTEGER; ch: CHAR; b : BOOLEAN;
+  VAR i: INTEGER;
   BEGIN
-    i := 0;
-    b := FALSE;
-    REPEAT
-      Read(R, ch);
-      IF ((ch = 0X) OR (ch = 0AX) OR (ch = 0DX)) THEN
-        b := TRUE
-      ELSE
-        x[i] := ch;
-        INC(i);
-      END;
-    UNTIL b
+    i := 0; REPEAT Read(R, x[i]); INC(i) UNTIL (x[i-1] = 0X) OR (x[i-1] = 0AX);
+    IF x[i-1] = 0AX THEN DEC(i) END;             (* Omit trailing LF *)
+    IF (i > 0) & (x[i-1] = 0DX) THEN DEC(i) END; (* Also omit preceeding trailing CR if present. *)
+    x[i] := 0X;                                  (* Guarantee zero termination. *)
   END ReadLine;
 
   PROCEDURE ReadNum*(VAR R: Rider; VAR x: ARRAY OF SYSTEM.BYTE);