@@ -184,11 +184,11 @@
 	   exactLength: (size_t)length
 {
 	size_t readLength = 0;
 
 	while (readLength < length) {
-		if ([self isAtEndOfStream])
+		if (self.atEndOfStream)
 			@throw [OFTruncatedDataException exception];
 
 		readLength += [self readIntoBuffer: (char *)buffer + readLength
 					    length: length - readLength];
 	}
@@ -660,11 +660,11 @@
 	OFMutableData *data = [OFMutableData data];
 	size_t pageSize = [OFSystemInfo pageSize];
 	char *buffer = [self allocMemoryWithSize: pageSize];
 
 	@try {
-		while (![self isAtEndOfStream]) {
+		while (!self.atEndOfStream) {
 			size_t length;
 
 			length = [self readIntoBuffer: buffer
 					       length: pageSize];
 			[data addItems: buffer
@@ -865,11 +865,11 @@
 - (OFString *)readLineWithEncoding: (of_string_encoding_t)encoding
 {
 	OFString *line = nil;
 
 	while ((line = [self tryReadLineWithEncoding: encoding]) == nil)
-		if ([self isAtEndOfStream])
+		if (self.atEndOfStream)
 			return nil;
 
 	return line;
 }
 
@@ -1112,14 +1112,13 @@
 - (OFString *)readTillDelimiter: (OFString *)delimiter
 		       encoding: (of_string_encoding_t)encoding
 {
 	OFString *ret = nil;
 
-
 	while ((ret = [self tryReadTillDelimiter: delimiter
 					encoding: encoding]) == nil)
-		if ([self isAtEndOfStream])
+		if (self.atEndOfStream)
 			return nil;
 
 	return ret;
 }
 
@@ -1694,13 +1693,13 @@
 
 	if (data == nil)
 		@throw [OFInvalidArgumentException exception];
 
 	pool = objc_autoreleasePoolPush();
-	length = [data count] * [data itemSize];
+	length = data.count * data.itemSize;
 
-	[self writeBuffer: [data items]
+	[self writeBuffer: data.items
 		   length: length];
 
 	objc_autoreleasePoolPop(pool);
 
 	return length;
@@ -1780,11 +1779,11 @@
 	int length;
 
 	if (format == nil)
 		@throw [OFInvalidArgumentException exception];
 
-	if ((length = of_vasprintf(&UTF8String, [format UTF8String],
+	if ((length = of_vasprintf(&UTF8String, format.UTF8String,
 	    arguments)) == -1)
 		@throw [OFInvalidFormatException exception];
 
 	@try {
 		[self writeBuffer: UTF8String
@@ -1812,12 +1811,12 @@
 	bool readImplemented = false, writeImplemented = false;
 
 	@try {
 		int readFlags;
 
-		readFlags =
-		    fcntl([(id)self fileDescriptorForReading], F_GETFL, 0);
+		readFlags = fcntl(((id <OFReadyForReadingObserving>)self)
+		    .fileDescriptorForReading, F_GETFL, 0);
 
 		readImplemented = true;
 
 		if (readFlags == -1)
 			@throw [OFSetOptionFailedException
@@ -1827,23 +1826,23 @@
 		if (enable)
 			readFlags &= ~O_NONBLOCK;
 		else
 			readFlags |= O_NONBLOCK;
 
-		if (fcntl([(id)self fileDescriptorForReading], F_SETFL,
-		    readFlags) == -1)
+		if (fcntl(((id <OFReadyForReadingObserving>)self)
+		    .fileDescriptorForReading, F_SETFL, readFlags) == -1)
 			@throw [OFSetOptionFailedException
 			    exceptionWithObject: self
 					  errNo: errno];
 	} @catch (OFNotImplementedException *e) {
 	}
 
 	@try {
 		int writeFlags;
 
-		writeFlags =
-		    fcntl([(id)self fileDescriptorForWriting], F_GETFL, 0);
+		writeFlags = fcntl(((id <OFReadyForWritingObserving>)self)
+		    .fileDescriptorForWriting, F_GETFL, 0);
 
 		writeImplemented = true;
 
 		if (writeFlags == -1)
 			@throw [OFSetOptionFailedException
@@ -1853,12 +1852,12 @@
 		if (enable)
 			writeFlags &= ~O_NONBLOCK;
 		else
 			writeFlags |= O_NONBLOCK;
 
-		if (fcntl([(id)self fileDescriptorForWriting], F_SETFL,
-		    writeFlags) == -1)
+		if (fcntl(((id <OFReadyForWritingObserving>)self)
+		    .fileDescriptorForWriting, F_SETFL, writeFlags) == -1)
 			@throw [OFSetOptionFailedException
 			    exceptionWithObject: self
 					  errNo: errno];
 	} @catch (OFNotImplementedException *e) {
 	}