@@ -181,11 +181,11 @@
 	@try {
 		_timersQueue = [[OFSortedList alloc] init];
 
 #if defined(OF_HAVE_SOCKETS)
 		_kernelEventObserver = [[OFKernelEventObserver alloc] init];
-		[_kernelEventObserver setDelegate: self];
+		_kernelEventObserver.delegate = self;
 
 		_readQueues = [[OFMutableDictionary alloc] init];
 		_writeQueues = [[OFMutableDictionary alloc] init];
 #elif defined(OF_HAVE_THREADS)
 		_condition = [[OFCondition alloc] init];
@@ -223,12 +223,12 @@
 	    [[_readQueues objectForKey: object] retain];
 
 	assert(queue != nil);
 
 	@try {
-		if (![[queue firstObject] handleObject: object]) {
-			of_list_object_t *listObject = [queue firstListObject];
+		if (![queue.firstObject handleObject: object]) {
+			of_list_object_t *listObject = queue.firstListObject;
 
 			/*
 			 * The handler might have called -[cancelAsyncRequests]
 			 * so that our queue is now empty, in which case we
 			 * should do nothing.
@@ -242,11 +242,11 @@
 				 */
 				[[listObject->object retain] autorelease];
 
 				[queue removeListObject: listObject];
 
-				if ([queue count] == 0) {
+				if (queue.count == 0) {
 					[_kernelEventObserver
 					    removeObjectForReading: object];
 					[_readQueues
 					    removeObjectForKey: object];
 				}
@@ -266,12 +266,12 @@
 	OFList *queue = [[_writeQueues objectForKey: object] retain];
 
 	assert(queue != nil);
 
 	@try {
-		if (![[queue firstObject] handleObject: object]) {
-			of_list_object_t *listObject = [queue firstListObject];
+		if (![queue.firstObject handleObject: object]) {
+			of_list_object_t *listObject = queue.firstListObject;
 
 			/*
 			 * The handler might have called -[cancelAsyncRequests]
 			 * so that our queue is now empty, in which case we
 			 * should do nothing.
@@ -285,11 +285,11 @@
 				 */
 				[[listObject->object retain] autorelease];
 
 				[queue removeListObject: listObject];
 
-				if ([queue count] == 0) {
+				if (queue.count == 0) {
 					[_kernelEventObserver
 					    removeObjectForWriting: object];
 					[_writeQueues
 					    removeObjectForKey: object];
 				}
@@ -461,15 +461,15 @@
 @implementation OFRunLoop_WriteDataQueueItem
 - (bool)handleObject: (id)object
 {
 	size_t length;
 	id exception = nil;
-	size_t dataLength = [_data count] * [_data itemSize];
+	size_t dataLength = _data.count * _data.itemSize;
 	OFData *newData, *oldData;
 
 	@try {
-		const char *dataItems = [_data items];
+		const char *dataItems = _data.items;
 
 		length = [object writeBuffer: dataItems + _writtenLength
 				      length: dataLength - _writtenLength];
 	} @catch (id e) {
 		length = 0;
@@ -718,12 +718,12 @@
 {
 	id exception = nil;
 	OFData *newData, *oldData;
 
 	@try {
-		[object sendBuffer: [_data items]
-			    length: [_data count] * [_data itemSize]
+		[object sendBuffer: _data.items
+			    length: _data.count * _data.itemSize
 			  receiver: &_receiver];
 	} @catch (id e) {
 		exception = e;
 	}
 
@@ -784,11 +784,11 @@
 }
 
 + (OFRunLoop *)currentRunLoop
 {
 #ifdef OF_HAVE_THREADS
-	return [[OFThread currentThread] runLoop];
+	return [OFThread currentThread].runLoop;
 #else
 	return [self mainRunLoop];
 #endif
 }
 
@@ -807,14 +807,14 @@
 	type *queueItem;						\
 									\
 	if (queue == nil) {						\
 		queue = [OFList list];					\
 		[state->_readQueues setObject: queue			\
-					 forKey: object];		\
+				       forKey: object];			\
 	}								\
 									\
-	if ([queue count] == 0)						\
+	if (queue.count == 0)						\
 		[state->_kernelEventObserver				\
 		    addObjectForReading: object];			\
 									\
 	queueItem = [[[type alloc] init] autorelease];
 # define NEW_WRITE(type, object, mode)					\
@@ -829,11 +829,11 @@
 		queue = [OFList list];					\
 		[state->_writeQueues setObject: queue			\
 					  forKey: object];		\
 	}								\
 									\
-	if ([queue count] == 0)						\
+	if (queue.count == 0)						\
 		[state->_kernelEventObserver				\
 		    addObjectForWriting: object];			\
 									\
 	queueItem = [[[type alloc] init] autorelease];
 #define QUEUE_ITEM							\
@@ -1036,11 +1036,11 @@
 
 	if (state == nil)
 		return;
 
 	if ((queue = [state->_writeQueues objectForKey: object]) != nil) {
-		assert([queue count] > 0);
+		assert(queue.count > 0);
 
 		/*
 		 * Clear the queue now, in case this has been called from a
 		 * handler, as otherwise, we'd do the cleanups below twice.
 		 */
@@ -1049,11 +1049,11 @@
 		[state->_kernelEventObserver removeObjectForWriting: object];
 		[state->_writeQueues removeObjectForKey: object];
 	}
 
 	if ((queue = [state->_readQueues objectForKey: object]) != nil) {
-		assert([queue count] > 0);
+		assert(queue.count > 0);
 
 		/*
 		 * Clear the queue now, in case this has been called from a
 		 * handler, as otherwise, we'd do the cleanups below twice.
 		 */
@@ -1180,11 +1180,11 @@
 	[state->_timersQueueMutex lock];
 	@try {
 #endif
 		of_list_object_t *iter;
 
-		for (iter = [state->_timersQueue firstListObject]; iter != NULL;
+		for (iter = state->_timersQueue.firstListObject; iter != NULL;
 		    iter = iter->next) {
 			if ([iter->object isEqual: timer]) {
 				[state->_timersQueue removeListObject: iter];
 				break;
 			}
@@ -1204,11 +1204,11 @@
 - (void)runUntilDate: (OFDate *)deadline
 {
 	_stop = false;
 
 	while (!_stop &&
-	    (deadline == nil || [deadline timeIntervalSinceNow] >= 0))
+	    (deadline == nil || deadline.timeIntervalSinceNow >= 0))
 		[self runMode: of_run_loop_mode_default
 		   beforeDate: deadline];
 }
 
 - (void)runMode: (of_run_loop_mode_t)mode
@@ -1232,14 +1232,14 @@
 #ifdef OF_HAVE_THREADS
 			[state->_timersQueueMutex lock];
 			@try {
 #endif
 				of_list_object_t *listObject =
-				    [state->_timersQueue firstListObject];
+				    state->_timersQueue.firstListObject;
 
-				if (listObject != NULL && [[listObject->object
-				    fireDate] timeIntervalSinceNow] <= 0) {
+				if (listObject != NULL && [listObject->object
+				    fireDate].timeIntervalSinceNow <= 0) {
 					timer = [[listObject->object
 					    retain] autorelease];
 
 					[state->_timersQueue
 					    removeListObject: listObject];
@@ -1252,11 +1252,11 @@
 			} @finally {
 				[state->_timersQueueMutex unlock];
 			}
 #endif
 
-			if ([timer isValid]) {
+			if (timer.valid) {
 				[timer fire];
 				return;
 			}
 		}
 
@@ -1275,26 +1275,26 @@
 		/* Watch for I/O events until the next timer is due */
 		if (nextTimer != nil || deadline != nil) {
 			of_time_interval_t timeout;
 
 			if (nextTimer != nil && deadline == nil)
-				timeout = [nextTimer timeIntervalSinceNow];
+				timeout = nextTimer.timeIntervalSinceNow;
 			else if (nextTimer == nil && deadline != nil)
-				timeout = [deadline timeIntervalSinceNow];
+				timeout = deadline.timeIntervalSinceNow;
 			else
-				timeout = [[nextTimer earlierDate: deadline]
-				    timeIntervalSinceNow];
+				timeout = [nextTimer earlierDate: deadline]
+				    .timeIntervalSinceNow;
 
 			if (timeout < 0)
 				timeout = 0;
 
 #if defined(OF_HAVE_SOCKETS)
 			@try {
 				[state->_kernelEventObserver
 				    observeForTimeInterval: timeout];
 			} @catch (OFObserveFailedException *e) {
-				if ([e errNo] != EINTR)
+				if (e.errNo != EINTR)
 					@throw e;
 			}
 #elif defined(OF_HAVE_THREADS)
 			[state->_condition lock];
 			[state->_condition waitForTimeInterval: timeout];
@@ -1310,11 +1310,11 @@
 			 */
 #if defined(OF_HAVE_SOCKETS)
 			@try {
 				[state->_kernelEventObserver observe];
 			} @catch (OFObserveFailedException *e) {
-				if ([e errNo] != EINTR)
+				if (e.errNo != EINTR)
 					@throw e;
 			}
 #elif defined(OF_HAVE_THREADS)
 			[state->_condition lock];
 			[state->_condition wait];