@@ -49,11 +49,11 @@
 	self = [super init];
 
 #ifndef OF_WINDOWS
 	if (_cancelFD[0] >= (int)FD_SETSIZE)
 		@throw [OFInitializationFailedException
-		    exceptionWithClass: [self class]];
+		    exceptionWithClass: self.class];
 #endif
 
 	FD_ZERO(&_readFDs);
 	FD_ZERO(&_writeFDs);
 	FD_SET(_cancelFD[0], &_readFDs);
@@ -66,11 +66,11 @@
 	return self;
 }
 
 - (void)of_addObjectForReading: (id <OFReadyForReadingObserving>)object
 {
-	int fd = [object fileDescriptorForReading];
+	int fd = object.fileDescriptorForReading;
 
 	if (fd < 0 || fd > INT_MAX - 1)
 		@throw [OFOutOfRangeException exception];
 
 #ifndef OF_WINDOWS
@@ -84,11 +84,11 @@
 	FD_SET((of_socket_t)fd, &_readFDs);
 }
 
 - (void)of_addObjectForWriting: (id <OFReadyForWritingObserving>)object
 {
-	int fd = [object fileDescriptorForWriting];
+	int fd = object.fileDescriptorForWriting;
 
 	if (fd < 0 || fd > INT_MAX - 1)
 		@throw [OFOutOfRangeException exception];
 
 #ifndef OF_WINDOWS
@@ -104,11 +104,11 @@
 
 - (void)of_removeObjectForReading: (id <OFReadyForReadingObserving>)object
 {
 	/* TODO: Adjust _maxFD */
 
-	int fd = [object fileDescriptorForReading];
+	int fd = object.fileDescriptorForReading;
 
 	if (fd < 0)
 		@throw [OFOutOfRangeException exception];
 
 #ifndef OF_WINDOWS
@@ -121,11 +121,11 @@
 
 - (void)of_removeObjectForWriting: (id <OFReadyForWritingObserving>)object
 {
 	/* TODO: Adjust _maxFD */
 
-	int fd = [object fileDescriptorForWriting];
+	int fd = object.fileDescriptorForWriting;
 
 	if (fd < 0)
 		@throw [OFOutOfRangeException exception];
 
 #ifndef OF_WINDOWS
@@ -187,12 +187,12 @@
 		OF_ENSURE(recvfrom(_cancelFD[0], (void *)&buffer, 1, 0, NULL,
 		    NULL) == 1);
 #endif
 	}
 
-	objects = [_readObjects objects];
-	count = [_readObjects count];
+	objects = _readObjects.objects;
+	count = _readObjects.count;
 
 	for (size_t i = 0; i < count; i++) {
 		void *pool = objc_autoreleasePoolPush();
 		int fd = [objects[i] fileDescriptorForReading];
 
@@ -202,12 +202,12 @@
 			[_delegate objectIsReadyForReading: objects[i]];
 
 		objc_autoreleasePoolPop(pool);
 	}
 
-	objects = [_writeObjects objects];
-	count = [_writeObjects count];
+	objects = _writeObjects.objects;
+	count = _writeObjects.count;
 
 	for (size_t i = 0; i < count; i++) {
 		void *pool = objc_autoreleasePoolPush();
 		int fd = [objects[i] fileDescriptorForWriting];