@@ -112,17 +112,17 @@
 		_writeObjects = [[OFMutableArray alloc] init];
 
 #ifdef OF_HAVE_PIPE
 		if (pipe(_cancelFD))
 			@throw [OFInitializationFailedException
-			    exceptionWithClass: [self class]];
+			    exceptionWithClass: self.class];
 #else
 		_cancelFD[0] = _cancelFD[1] = socket(AF_INET, SOCK_DGRAM, 0);
 
 		if (_cancelFD[0] == INVALID_SOCKET)
 			@throw [OFInitializationFailedException
-			    exceptionWithClass: [self class]];
+			    exceptionWithClass: self.class];
 
 		_cancelAddr.sin_family = AF_INET;
 		_cancelAddr.sin_port = 0;
 		_cancelAddr.sin_addr.s_addr =
 		    inet_addr((const void *)"127.0.0.1");
@@ -132,17 +132,17 @@
 
 # if !defined(OF_WII) && !defined(OF_NINTENDO_3DS)
 		if (bind(_cancelFD[0], (struct sockaddr *)&_cancelAddr,
 		    sizeof(_cancelAddr)) != 0)
 			@throw [OFInitializationFailedException
-			    exceptionWithClass: [self class]];
+			    exceptionWithClass: self.class];
 
 		cancelAddrLen = sizeof(_cancelAddr);
 		if (of_getsockname(_cancelFD[0],
 		    (struct sockaddr *)&_cancelAddr, &cancelAddrLen) != 0)
 			@throw [OFInitializationFailedException
-			    exceptionWithClass: [self class]];
+			    exceptionWithClass: self.class];
 # else
 		for (;;) {
 			uint16_t rnd = 0;
 			int ret;
 
@@ -157,11 +157,11 @@
 			if (ret == 0)
 				break;
 
 			if (of_socket_errno() != EADDRINUSE)
 				@throw [OFInitializationFailedException
-				    exceptionWithClass: [self class]];
+				    exceptionWithClass: self.class];
 		}
 # endif
 #endif
 
 #ifdef OF_HAVE_THREADS
@@ -306,15 +306,15 @@
 
 #ifdef OF_HAVE_THREADS
 	[_mutex lock];
 	@try {
 #endif
-		int *queueActions = [_queueActions items];
-		id const *queueObjects = [_queueObjects objects];
-		size_t count = [_queueActions count];
+		const int *queueActions = _queueActions.items;
+		id const *queueObjects = _queueObjects.objects;
+		size_t count = _queueActions.count;
 
-		OF_ENSURE([_queueObjects count] == count);
+		OF_ENSURE(_queueObjects.count == count);
 
 		for (size_t i = 0; i < count; i++) {
 			int action = queueActions[i];
 			id object = queueObjects[i];
 
@@ -410,11 +410,11 @@
 	OF_UNRECOGNIZED_SELECTOR
 }
 
 - (void)observeUntilDate: (OFDate *)date
 {
-	[self observeForTimeInterval: [date timeIntervalSinceNow]];
+	[self observeForTimeInterval: date.timeIntervalSinceNow];
 }
 
 - (void)cancel
 {
 #ifdef OF_HAVE_PIPE