@@ -32,11 +32,11 @@
 
 #import "OFInitializationFailedException.h"
 #import "OFObserveFailedException.h"
 #import "OFOutOfRangeException.h"
 
-#define EVENTLIST_SIZE 64
+#define eventListSize 64
 
 @implementation OFKqueueKernelEventObserver
 - (instancetype)init
 {
 	self = [super init];
@@ -151,23 +151,23 @@
 								 errNo: errno];
 
 	[super removeObjectForWriting: object];
 }
 
-- (void)observeForTimeInterval: (of_time_interval_t)timeInterval
+- (void)observeForTimeInterval: (OFTimeInterval)timeInterval
 {
 	struct timespec timeout;
-	struct kevent eventList[EVENTLIST_SIZE];
+	struct kevent eventList[eventListSize];
 	int events;
 
 	if ([self of_processReadBuffers])
 		return;
 
 	timeout.tv_sec = (time_t)timeInterval;
 	timeout.tv_nsec = (long)((timeInterval - timeout.tv_sec) * 1000000000);
 
-	events = kevent(_kernelQueue, NULL, 0, eventList, EVENTLIST_SIZE,
+	events = kevent(_kernelQueue, NULL, 0, eventList, eventListSize,
 	    (timeInterval != -1 ? &timeout : NULL));
 
 	if (events < 0)
 		@throw [OFObserveFailedException exceptionWithObserver: self
 								 errNo: errno];
@@ -182,11 +182,11 @@
 
 		if (eventList[i].ident == (uintptr_t)_cancelFD[0]) {
 			char buffer;
 
 			assert(eventList[i].filter == EVFILT_READ);
-			OF_ENSURE(read(_cancelFD[0], &buffer, 1) == 1);
+			OFEnsure(read(_cancelFD[0], &buffer, 1) == 1);
 
 			continue;
 		}
 
 		pool = objc_autoreleasePoolPush();