--- a/ByteArray.st	Wed Mar 28 09:51:58 2018 +0100
+++ b/ByteArray.st	Fri Apr 13 09:37:08 2018 +0100
@@ -232,10 +232,10 @@
 
 %{  /* NOCONTEXT */
 
-    REGISTER int indx;
+    REGISTER INT indx;
     REGISTER OBJ slf;
     REGISTER OBJ cls;
-    REGISTER int nIndex;
+    REGISTER INT nIndex;
 
     if (__isSmallInteger(index)) {
 	indx = __intVal(index) - 1;
@@ -249,7 +249,7 @@
 	    indx += __OBJS2BYTES__(__intVal(__ClassInstPtr(cls)->c_ninstvars));
 	}
 	nIndex = __byteArraySize(slf);
-	if ((unsigned)indx < (unsigned)nIndex) {
+	if ((unsigned INT)indx < (unsigned INT)nIndex) {
 	    RETURN ( __mkSmallInteger((__ByteArrayInstPtr(slf)->ba_element[indx])) );
 	}
     }
@@ -266,8 +266,8 @@
 
 %{  /* NOCONTEXT */
 
-    REGISTER int indx;
-    int nIndex;
+    REGISTER INT indx;
+    unsigned INT nIndex;
     int val;
     REGISTER OBJ slf;
     REGISTER OBJ cls;
@@ -286,7 +286,7 @@
 		indx += __OBJS2BYTES__(__intVal(__ClassInstPtr(cls)->c_ninstvars));
 	    }
 	    nIndex = __byteArraySize(slf);
-	    if ((unsigned)indx < (unsigned)nIndex) {
+	    if ((unsigned INT)indx < (unsigned INT)nIndex) {
 		__ByteArrayInstPtr(slf)->ba_element[indx] = val;
 		RETURN ( value );
 	    }
@@ -306,9 +306,9 @@
 
 %{  /* NOCONTEXT */
 
-    REGISTER int indx;
+    REGISTER INT indx;
     REGISTER int byte;
-    int nIndex;
+    unsigned INT nIndex;
     REGISTER OBJ slf;
     REGISTER OBJ cls;
 
@@ -324,7 +324,7 @@
 	    byte += __OBJS2BYTES__(__intVal(__ClassInstPtr(cls)->c_ninstvars));
 	}
 	nIndex = __byteArraySize(slf);
-	if ((unsigned)byte < (unsigned)nIndex) {
+	if ((unsigned)byte < (unsigned INT)nIndex) {
 	    RETURN ( __mkSmallInteger(((__ByteArrayInstPtr(slf)->ba_element[byte] & (1 << indx)) != 0)) );
 	}
     }
@@ -349,9 +349,9 @@
 
 %{  /* NOCONTEXT */
 
-    REGISTER int indx;
+    REGISTER INT indx;
     REGISTER int byte;
-    int nIndex;
+    unsigned INT nIndex;
     REGISTER OBJ slf;
     REGISTER OBJ cls;
 
@@ -367,7 +367,7 @@
 	    byte += __OBJS2BYTES__(__intVal(__ClassInstPtr(cls)->c_ninstvars));
 	}
 	nIndex = __byteArraySize(slf);
-	if ((unsigned)byte < (unsigned)nIndex) {
+	if ((unsigned)byte < (unsigned INT)nIndex) {
 	    __ByteArrayInstPtr(slf)->ba_element[byte] &= ~(1 << indx);
 	    RETURN (slf);
 	}
@@ -414,13 +414,13 @@
         if (indx >= 0) {
             int byteIndex;
             int bitIndex;
-            int nIndex;
+            unsigned INT nIndex;
 
             byteIndex = indx / 8;
             bitIndex = indx % 8;
 
             nIndex = __byteArraySize(self);
-            if ((unsigned)byteIndex < (unsigned)nIndex) {
+            if ((unsigned)byteIndex < (unsigned INT)nIndex) {
                 __ByteArrayInstPtr(self)->ba_element[byteIndex] |= (1 << bitIndex);
                 RETURN (self);
             }
@@ -462,8 +462,8 @@
 
 %{  /* NOCONTEXT */
 
-    REGISTER int indx;
-    int nIndex;
+    REGISTER INT indx;
+    unsigned INT nIndex;
     REGISTER OBJ slf;
     REGISTER OBJ cls;
 
@@ -475,7 +475,7 @@
 	    indx += __OBJS2BYTES__(__intVal(__ClassInstPtr(cls)->c_ninstvars));
 	}
 	nIndex = __byteArraySize(slf);
-	if ((unsigned)indx < (unsigned)nIndex) {
+	if ((unsigned INT)indx < (unsigned INT)nIndex) {
 	    RETURN ( __mkSmallInteger((__ByteArrayInstPtr(slf)->ba_element[indx])) );
 	}
     }
@@ -490,8 +490,8 @@
 
 %{  /* NOCONTEXT */
 
-    REGISTER int indx;
-    int nIndex;
+    REGISTER INT indx;
+    unsigned INT nIndex;
     int val;
     REGISTER OBJ slf;
     REGISTER OBJ cls;
@@ -507,7 +507,7 @@
                 indx += __OBJS2BYTES__(__intVal(__ClassInstPtr(cls)->c_ninstvars));
             }
             nIndex = __byteArraySize(slf);
-            if ((unsigned)indx < (unsigned)nIndex) {
+            if ((unsigned INT)indx < (unsigned INT)nIndex) {
                 __ByteArrayInstPtr(slf)->ba_element[indx] = val;
                 RETURN ( value );
             }
@@ -532,7 +532,7 @@
 %{  /* NOCONTEXT */
 
     REGISTER INT indx;
-    int nIndex;
+    unsigned INT nIndex;
     union {
         unsigned char u_char[4];
         unsigned int u_uint;
@@ -596,7 +596,7 @@
 %{  /* NOCONTEXT */
 
     REGISTER INT indx;
-    int nIndex;
+    unsigned INT nIndex;
     int val;
     OBJ cls;
     unsigned char *byteP;
@@ -688,7 +688,7 @@
 %{  /* NOCONTEXT */
 
     REGISTER INT indx;
-    int nIndex;
+    unsigned INT nIndex;
     union {
         unsigned char u_char[2];
         unsigned short u_ushort;
@@ -728,7 +728,7 @@
 
 %{  /* NOCONTEXT */
     REGISTER INT indx;
-    int nIndex;
+    unsigned INT nIndex;
     int val;
     unsigned char *byteP;
 
@@ -805,7 +805,7 @@
 %{  /* NOCONTEXT */
 
     REGISTER INT indx;
-    int nIndex;
+    unsigned INT nIndex;
     int v;
     union {
         unsigned char u_char[2];
@@ -874,7 +874,7 @@
 %{  /* NOCONTEXT */
 
     REGISTER INT indx;
-    int nIndex;
+    unsigned INT nIndex;
     int val;
     OBJ cls;
     unsigned char *byteP;