@@ -440,11 +440,11 @@
 		exception = e;
 	}
 
 # ifdef OF_HAVE_BLOCKS
 	if (_block != NULL)
-		return _block(object, _buffer, length, exception);
+		return _block(length, exception);
 	else {
 # endif
 		if (![_delegate respondsToSelector:
 		    @selector(stream:didReadIntoBuffer:length:exception:)])
 			return false;
@@ -488,11 +488,11 @@
 	    exception == nil)
 		return true;
 
 # ifdef OF_HAVE_BLOCKS
 	if (_block != NULL) {
-		if (!_block(object, _buffer, _readLength, exception))
+		if (!_block(_readLength, exception))
 			return false;
 
 		_readLength = 0;
 		return true;
 	} else {
@@ -540,11 +540,11 @@
 	if (line == nil && ![object isAtEndOfStream] && exception == nil)
 		return true;
 
 # ifdef OF_HAVE_BLOCKS
 	if (_block != NULL)
-		return _block(object, line, exception);
+		return _block(line, exception);
 	else {
 # endif
 		if (![_delegate respondsToSelector:
 		    @selector(stream:didReadLine:exception:)])
 			return false;
@@ -590,11 +590,11 @@
 	if (_writtenLength != dataLength && exception == nil)
 		return true;
 
 # ifdef OF_HAVE_BLOCKS
 	if (_block != NULL) {
-		newData = _block(object, _data, _writtenLength, exception);
+		newData = _block(_data, _writtenLength, exception);
 
 		if (newData == nil)
 			return false;
 
 		oldData = _data;
@@ -662,12 +662,11 @@
 	if (_writtenLength != cStringLength && exception == nil)
 		return true;
 
 # ifdef OF_HAVE_BLOCKS
 	if (_block != NULL) {
-		newString = _block(object, _string, _encoding, _writtenLength,
-		    exception);
+		newString = _block(_string, _writtenLength, exception);
 
 		if (newString == nil)
 			return false;
 
 		oldString = _string;
@@ -770,16 +769,16 @@
 
 # ifdef OF_HAVE_BLOCKS
 	if (_block != NULL) {
 		if ([object isKindOfClass: [OFStreamSocket class]])
 			return ((of_stream_socket_async_accept_block_t)
-			    _block)(object, acceptedSocket, exception);
+			    _block)(acceptedSocket, exception);
 		else if ([object isKindOfClass:
 		    [OFSequencedPacketSocket class]])
 			return
 			    ((of_sequenced_packet_socket_async_accept_block_t)
-			    _block)(object, acceptedSocket, exception);
+			    _block)(acceptedSocket, exception);
 		else
 			OF_ENSURE(0);
 	} else {
 # endif
 		if (![_delegate respondsToSelector:
@@ -820,11 +819,11 @@
 		exception = e;
 	}
 
 # ifdef OF_HAVE_BLOCKS
 	if (_block != NULL)
-		return _block(object, _buffer, length, &address, exception);
+		return _block(length, &address, exception);
 	else {
 # endif
 		if (![_delegate respondsToSelector: @selector(
 		    socket:didReceiveIntoBuffer:length:sender:exception:)])
 			return false;
@@ -863,11 +862,11 @@
 		exception = e;
 	}
 
 # ifdef OF_HAVE_BLOCKS
 	if (_block != NULL) {
-		newData = _block(object, _data, &_receiver, exception);
+		newData = _block(_data, &_receiver, exception);
 
 		if (newData == nil)
 			return false;
 
 		oldData = _data;
@@ -924,11 +923,11 @@
 		exception = e;
 	}
 
 # ifdef OF_HAVE_BLOCKS
 	if (_block != NULL)
-		return _block(object, _buffer, length, exception);
+		return _block(length, exception);
 	else {
 # endif
 		if (![_delegate respondsToSelector: @selector(
 		    socket:didReceiveIntoBuffer:length:exception:)])
 			return false;
@@ -965,11 +964,11 @@
 		exception = e;
 	}
 
 # ifdef OF_HAVE_BLOCKS
 	if (_block != NULL) {
-		newData = _block(object, _data, exception);
+		newData = _block(_data, exception);
 
 		if (newData == nil)
 			return false;
 
 		oldData = _data;