--- a/ExternalStream.st	Tue Mar 22 12:09:09 2016 +0100
+++ b/ExternalStream.st	Tue Mar 22 12:13:15 2016 +0100
@@ -3934,69 +3934,66 @@
      || (__INST(handleType) == @symbol(socketFilePointer))
      || (__INST(handleType) == @symbol(socketHandle))
      || (__INST(handleType) == @symbol(pipeFilePointer))) {
-	if (((fp = __INST(handle)) != nil)
-	    && (__INST(mode) != @symbol(writeonly))
-	) {
-	    FILEPOINTER f;
-	    int ret, _buffered;
-	    int value;
-	    union {
-		unsigned char buffer[4];
-		int intVal;
-	    } u;
-
-	    f = __FILEVal(fp);
-	    _buffered = (__INST(buffered) == true);
-	    if (_buffered) {
-		__READING__(f)
-	    }
-	    __READBYTES__(ret, f, u.buffer, 4, _buffered, __INST(handleType));
-
-	    if (ret == 4) {
-		if (__isSmallInteger(__INST(position))) {
-		    INT np = __intVal(__INST(position)) + 4;
-		    OBJ t;
-
-		    t = __MKINT(np); __INST(position) = t; __STORE(self, t);
-		} else {
-		    __INST(position) = nil; /* i.e. do not know */
-		}
-		if (msbFlag == true) {
+        if (((fp = __INST(handle)) != nil)
+            && (__INST(mode) != @symbol(writeonly))
+        ) {
+            FILEPOINTER f;
+            int ret, _buffered;
+            int value;
+            union {
+                unsigned char buffer[4];
+                int intVal;
+            } u;
+
+            f = __FILEVal(fp);
+            _buffered = (__INST(buffered) == true);
+            if (_buffered) {
+                __READING__(f)
+            }
+            __READBYTES__(ret, f, u.buffer, 4, _buffered, __INST(handleType));
+
+            if (ret == 4) {
+                if (__isSmallInteger(__INST(position))) {
+                    INT np = __intVal(__INST(position)) + 4;
+                    OBJ t;
+
+                    t = __MKINT(np); __INST(position) = t; __STORE(self, t);
+                } else {
+                    __INST(position) = nil; /* i.e. do not know */
+                }
+                if (msbFlag == true) {
 #if defined(__MSBFIRST__)
-		    value = u.intVal;
+                    value = u.intVal;
 #else
-		    value = (u.buffer[0] & 0xFF);
-		    value = (value << 8) | (u.buffer[1] & 0xFF);
-		    value = (value << 8) | (u.buffer[2] & 0xFF);
-		    value = (value << 8) | (u.buffer[3] & 0xFF);
+                    value = (u.buffer[0] & 0xFF);
+                    value = (value << 8) | (u.buffer[1] & 0xFF);
+                    value = (value << 8) | (u.buffer[2] & 0xFF);
+                    value = (value << 8) | (u.buffer[3] & 0xFF);
 #endif
-		} else {
+                } else {
 #if defined(__LSBFIRST__)
-		    value = u.intVal;
+                    value = u.intVal;
 #else
-		    value = (u.buffer[3] & 0xFF);
-		    value = (value << 8) | (u.buffer[2] & 0xFF);
-		    value = (value << 8) | (u.buffer[1] & 0xFF);
-		    value = (value << 8) | (u.buffer[0] & 0xFF);
+                    value = (u.buffer[3] & 0xFF);
+                    value = (value << 8) | (u.buffer[2] & 0xFF);
+                    value = (value << 8) | (u.buffer[1] & 0xFF);
+                    value = (value << 8) | (u.buffer[0] & 0xFF);
 #endif
-		}
+                }
 #if __POINTER_SIZE__ == 8
-		RETURN ( __mkSmallInteger(value));
+                RETURN ( __mkSmallInteger(value));
 #else
-		if ((value >= _MIN_INT) && (value <= _MAX_INT)) {
-		    RETURN ( __mkSmallInteger(value));
-		}
-		RETURN ( __MKLARGEINT(value) );
+                RETURN ( __MKINT(value) );
 #endif
-	    }
-
-	    if (ret < 0) {
-		__INST(position) = nil;
-		error = __mkSmallInteger(__threadErrno);
-	    } else /* ret == 0 */ {
-		__INST(hitEOF) = true;
-	    }
-	}
+            }
+
+            if (ret < 0) {
+                __INST(position) = nil;
+                error = __mkSmallInteger(__threadErrno);
+            } else /* ret == 0 */ {
+                __INST(hitEOF) = true;
+            }
+        }
     }
 %}.
     hitEOF ifTrue:[^ self pastEndRead].