@@ -62,11 +62,11 @@
 			fcntl(_epfd, F_SETFD, flags | FD_CLOEXEC);
 #endif
 
 		_FDToEvents = [[OFMapTable alloc]
 		    initWithKeyFunctions: mapFunctions
-			  valueFunctions: mapFunctions];
+			 objectFunctions: mapFunctions];
 
 		memset(&event, 0, sizeof(event));
 		event.events = EPOLLIN;
 		event.data.ptr = [OFNull null];
 
@@ -94,11 +94,12 @@
 	      events: (int)addEvents
 {
 	struct epoll_event event;
 	intptr_t events;
 
-	events = (intptr_t)[_FDToEvents valueForKey: (void*)((intptr_t)fd + 1)];
+	events = (intptr_t)[_FDToEvents
+	    objectForKey: (void*)((intptr_t)fd + 1)];
 
 	memset(&event, 0, sizeof(event));
 	event.events = (int)events | addEvents;
 	event.data.ptr = object;
 
@@ -105,30 +106,31 @@
 	if (epoll_ctl(_epfd, (events == 0 ? EPOLL_CTL_ADD : EPOLL_CTL_MOD),
 	    fd, &event) == -1)
 		@throw [OFObserveFailedException exceptionWithObserver: self
 								 errNo: errno];
 
-	[_FDToEvents setValue: (void*)(events | addEvents)
-		       forKey: (void*)((intptr_t)fd + 1)];
+	[_FDToEvents setObject: (void*)(events | addEvents)
+			forKey: (void*)((intptr_t)fd + 1)];
 }
 
 - (void)OF_removeObject: (id)object
 	 fileDescriptor: (int)fd
 		 events: (int)removeEvents
 {
 	intptr_t events;
 
-	events = (intptr_t)[_FDToEvents valueForKey: (void*)((intptr_t)fd + 1)];
+	events = (intptr_t)[_FDToEvents
+	    objectForKey: (void*)((intptr_t)fd + 1)];
 	events &= ~removeEvents;
 
 	if (events == 0) {
 		if (epoll_ctl(_epfd, EPOLL_CTL_DEL, fd, NULL) == -1)
 			@throw [OFObserveFailedException
 			    exceptionWithObserver: self
 					    errNo: errno];
 
-		[_FDToEvents removeValueForKey: (void*)((intptr_t)fd + 1)];
+		[_FDToEvents removeObjectForKey: (void*)((intptr_t)fd + 1)];
 	} else {
 		struct epoll_event event;
 
 		memset(&event, 0, sizeof(event));
 		event.events = (int)events;
@@ -137,12 +139,12 @@
 		if (epoll_ctl(_epfd, EPOLL_CTL_MOD, fd, &event) == -1)
 			@throw [OFObserveFailedException
 			    exceptionWithObserver: self
 					    errNo: errno];
 
-		[_FDToEvents setValue: (void*)events
-			       forKey: (void*)((intptr_t)fd + 1)];
+		[_FDToEvents setObject: (void*)events
+				forKey: (void*)((intptr_t)fd + 1)];
 	}
 }
 
 - (void)OF_addObjectForReading: (id <OFReadyForReadingObserving>)object
 {