@@ -527,11 +527,12 @@
 	code								\
 	[queue appendObject: queueItem];				\
 									\
 	objc_autoreleasePoolPop(pool);
 
-+ (void)of_addAsyncReadForStream: (OFStream *)stream
++ (void)of_addAsyncReadForStream: (OFStream <OFReadyForReadingObserving> *)
+				      stream
 			  buffer: (void *)buffer
 			  length: (size_t)length
 			  target: (id)target
 			selector: (SEL)selector
 			 context: (id)context
@@ -543,11 +544,12 @@
 		queueItem->_buffer = buffer;
 		queueItem->_length = length;
 	})
 }
 
-+ (void)of_addAsyncReadForStream: (OFStream *)stream
++ (void)of_addAsyncReadForStream: (OFStream <OFReadyForReadingObserving> *)
+				      stream
 			  buffer: (void *)buffer
 		     exactLength: (size_t)exactLength
 			  target: (id)target
 			selector: (SEL)selector
 			 context: (id)context
@@ -559,11 +561,12 @@
 		queueItem->_buffer = buffer;
 		queueItem->_exactLength = exactLength;
 	})
 }
 
-+ (void)of_addAsyncReadLineForStream: (OFStream *)stream
++ (void)of_addAsyncReadLineForStream: (OFStream <OFReadyForReadingObserving> *)
+					  stream
 			    encoding: (of_string_encoding_t)encoding
 			      target: (id)target
 			    selector: (SEL)selector
 			     context: (id)context
 {
@@ -573,11 +576,12 @@
 		queueItem->_context = [context retain];
 		queueItem->_encoding = encoding;
 	})
 }
 
-+ (void)of_addAsyncWriteForStream: (OFStream *)stream
++ (void)of_addAsyncWriteForStream: (OFStream <OFReadyForWritingObserving> *)
+				       stream
 			   buffer: (const void *)buffer
 			   length: (size_t)length
 			   target: (id)target
 			 selector: (SEL)selector
 			  context: (id)context
@@ -636,11 +640,12 @@
 		queueItem->_receiver = receiver;
 	})
 }
 
 # ifdef OF_HAVE_BLOCKS
-+ (void)of_addAsyncReadForStream: (OFStream *)stream
++ (void)of_addAsyncReadForStream: (OFStream <OFReadyForReadingObserving> *)
+				      stream
 			  buffer: (void *)buffer
 			  length: (size_t)length
 			   block: (of_stream_async_read_block_t)block
 {
 	ADD_READ(OFRunLoop_ReadQueueItem, stream, {
@@ -648,11 +653,12 @@
 		queueItem->_buffer = buffer;
 		queueItem->_length = length;
 	})
 }
 
-+ (void)of_addAsyncReadForStream: (OFStream *)stream
++ (void)of_addAsyncReadForStream: (OFStream <OFReadyForReadingObserving> *)
+				      stream
 			  buffer: (void *)buffer
 		     exactLength: (size_t)exactLength
 			   block: (of_stream_async_read_block_t)block
 {
 	ADD_READ(OFRunLoop_ExactReadQueueItem, stream, {
@@ -660,21 +666,23 @@
 		queueItem->_buffer = buffer;
 		queueItem->_exactLength = exactLength;
 	})
 }
 
-+ (void)of_addAsyncReadLineForStream: (OFStream *)stream
++ (void)of_addAsyncReadLineForStream: (OFStream <OFReadyForReadingObserving> *)
+					  stream
 			    encoding: (of_string_encoding_t)encoding
 			       block: (of_stream_async_read_line_block_t)block
 {
 	ADD_READ(OFRunLoop_ReadLineQueueItem, stream, {
 		queueItem->_block = [block copy];
 		queueItem->_encoding = encoding;
 	})
 }
 
-+ (void)of_addAsyncWriteForStream: (OFStream *)stream
++ (void)of_addAsyncWriteForStream: (OFStream <OFReadyForWritingObserving> *)
+				       stream
 			   buffer: (const void *)buffer
 			   length: (size_t)length
 			    block: (of_stream_async_write_block_t)block
 {
 	ADD_WRITE(OFRunLoop_WriteQueueItem, stream, {