@@ -30,17 +30,10 @@
 #import "OFNumber.h"
 #import "OFAutoreleasePool.h"
 
 #import "OFOutOfRangeException.h"
 
-enum {
-	QUEUE_ADD = 0,
-	QUEUE_REMOVE = 1,
-	QUEUE_READ = 0,
-	QUEUE_WRITE = 2
-};
-
 @implementation OFStreamObserver_poll
 - init
 {
 	self = [super init];
 
@@ -47,11 +40,10 @@
 	@try {
 		struct pollfd p = { 0, POLLIN, 0 };
 
 		FDs = [[OFDataArray alloc] initWithItemSize:
 		    sizeof(struct pollfd)];
-		FDToStream = [[OFMutableDictionary alloc] init];
 
 		p.fd = cancelFD[0];
 		[FDs addItem: &p];
 	} @catch (id e) {
 		[self release];
@@ -61,40 +53,34 @@
 	return self;
 }
 
 - (void)dealloc
 {
-	[FDToStream release];
 	[FDs release];
 
 	[super dealloc];
 }
-
 
 - (void)_addStream: (OFStream*)stream
 	withEvents: (short)events
 {
 	struct pollfd *FDsCArray = [FDs cArray];
 	size_t i, count = [FDs count];
-	int fileDescriptor = [stream fileDescriptor];
+	int fd = [stream fileDescriptor];
 	BOOL found = NO;
 
 	for (i = 0; i < count; i++) {
-		if (FDsCArray[i].fd == fileDescriptor) {
+		if (FDsCArray[i].fd == fd) {
 			FDsCArray[i].events |= events;
 			found = YES;
+			break;
 		}
 	}
 
 	if (!found) {
-		OFAutoreleasePool *pool = [[OFAutoreleasePool alloc] init];
-		struct pollfd p = { fileDescriptor, events | POLLERR, 0 };
+		struct pollfd p = { fd, events | POLLERR, 0 };
 		[FDs addItem: &p];
-		[FDToStream setObject: stream
-			       forKey: [OFNumber numberWithInt:
-				       fileDescriptor]];
-		[pool release];
 	}
 }
 
 - (void)_removeStream: (OFStream*)stream
 	   withEvents: (short)events
@@ -103,75 +89,42 @@
 	size_t i, nFDs = [FDs count];
 	int fileDescriptor = [stream fileDescriptor];
 
 	for (i = 0; i < nFDs; i++) {
 		if (FDsCArray[i].fd == fileDescriptor) {
-			OFAutoreleasePool *pool;
-
-			FDsCArray[i].events &= ~events;
-
-			if ((FDsCArray[i].events & ~POLLERR) != 0)
-				return;
-
-			pool = [[OFAutoreleasePool alloc] init];
-
-			[FDs removeItemAtIndex: i];
-			[FDToStream removeObjectForKey:
-			    [OFNumber numberWithInt: fileDescriptor]];
-
-			[pool release];
-		}
-	}
-}
-
-- (void)_processQueue
-{
-	@synchronized (queue) {
-		OFStream **queueCArray = [queue cArray];
-		OFNumber **queueInfoCArray = [queueInfo cArray];
-		size_t i, count = [queue count];
-
-		for (i = 0; i < count; i++) {
-			switch ([queueInfoCArray[i] intValue]) {
-			case QUEUE_ADD | QUEUE_READ:
-				[readStreams addObject: queueCArray[i]];
-
-				[self _addStream: queueCArray[i]
-				      withEvents: POLLIN];
-
-				break;
-			case QUEUE_ADD | QUEUE_WRITE:
-				[writeStreams addObject: queueCArray[i]];
-
-				[self _addStream: queueCArray[i]
-				      withEvents: POLLOUT];
-
-				break;
-			case QUEUE_REMOVE | QUEUE_READ:
-				[readStreams removeObjectIdenticalTo:
-				    queueCArray[i]];
-
-				[self _removeStream: queueCArray[i]
-					 withEvents: POLLIN];
-
-				break;
-			case QUEUE_REMOVE | QUEUE_WRITE:
-				[writeStreams removeObjectIdenticalTo:
-				    queueCArray[i]];
-
-				[self _removeStream: queueCArray[i]
-					 withEvents: POLLOUT];
-
-				break;
-			default:
-				assert(0);
-			}
-		}
-
-		[queue removeNObjects: count];
-		[queueInfo removeNObjects: count];
-	}
+			FDsCArray[i].events &= ~events;
+
+			if ((FDsCArray[i].events & ~POLLERR) == 0)
+				[FDs removeItemAtIndex: i];
+
+			break;
+		}
+	}
+}
+
+- (void)_addStreamToObserveForReading: (OFStream*)stream
+{
+	[self _addStream: stream
+	      withEvents: POLLIN];
+}
+
+- (void)_addStreamToObserveForWriting: (OFStream*)stream
+{
+	[self _addStream: stream
+	      withEvents: POLLOUT];
+}
+
+- (void)_removeStreamToObserveForReading: (OFStream*)stream
+{
+	[self _removeStream: stream
+		 withEvents: POLLIN];
+}
+
+- (void)_removeStreamToObserveForWriting: (OFStream*)stream
+{
+	[self _removeStream: stream
+		 withEvents: POLLOUT];
 }
 
 - (BOOL)observeWithTimeout: (int)timeout
 {
 	OFAutoreleasePool *pool = [[OFAutoreleasePool alloc] init];
@@ -193,13 +146,10 @@
 
 	if (poll(FDsCArray, (nfds_t)nFDs, timeout) < 1)
 		return NO;
 
 	for (i = 0; i < nFDs; i++) {
-		OFNumber *num;
-		OFStream *stream;
-
 		if (FDsCArray[i].revents & POLLIN) {
 			if (FDsCArray[i].fd == cancelFD[0]) {
 				char buffer;
 
 				assert(read(cancelFD[0], &buffer, 1) > 0);
@@ -206,27 +156,24 @@
 				FDsCArray[i].revents = 0;
 
 				continue;
 			}
 
-			num = [OFNumber numberWithInt: FDsCArray[i].fd];
-			stream = [FDToStream objectForKey: num];
-			[delegate streamDidBecomeReadyForReading: stream];
+			[delegate streamDidBecomeReadyForReading:
+			    FDToStream[FDsCArray[i].fd]];
 			[pool releaseObjects];
 		}
 
 		if (FDsCArray[i].revents & POLLOUT) {
-			num = [OFNumber numberWithInt: FDsCArray[i].fd];
-			stream = [FDToStream objectForKey: num];
-			[delegate streamDidBecomeReadyForReading: stream];
+			[delegate streamDidBecomeReadyForReading:
+			    FDToStream[FDsCArray[i].fd]];
 			[pool releaseObjects];
 		}
 
 		if (FDsCArray[i].revents & POLLERR) {
-			num = [OFNumber numberWithInt: FDsCArray[i].fd];
-			stream = [FDToStream objectForKey: num];
-			[delegate streamDidReceiveException: stream];
+			[delegate streamDidReceiveException:
+			    FDToStream[FDsCArray[i].fd]];
 			[pool releaseObjects];
 		}
 
 		FDsCArray[i].revents = 0;
 	}