@@ -674,11 +674,11 @@
 	void *pool = objc_autoreleasePoolPush();
 	OFTimer *timer = [OFTimer timerWithTimeInterval: 0
 						 target: self
 					       selector: selector
 						repeats: false];
-	[[thread runLoop] addTimer: timer];
+	[thread.runLoop addTimer: timer];
 
 	if (waitUntilDone)
 		[timer waitUntilDone];
 
 	objc_autoreleasePoolPop(pool);
@@ -693,11 +693,11 @@
 	OFTimer *timer = [OFTimer timerWithTimeInterval: 0
 						 target: self
 					       selector: selector
 						 object: object
 						repeats: false];
-	[[thread runLoop] addTimer: timer];
+	[thread.runLoop addTimer: timer];
 
 	if (waitUntilDone)
 		[timer waitUntilDone];
 
 	objc_autoreleasePoolPop(pool);
@@ -714,11 +714,11 @@
 						 target: self
 					       selector: selector
 						 object: object1
 						 object: object2
 						repeats: false];
-	[[thread runLoop] addTimer: timer];
+	[thread.runLoop addTimer: timer];
 
 	if (waitUntilDone)
 		[timer waitUntilDone];
 
 	objc_autoreleasePoolPop(pool);
@@ -737,11 +737,11 @@
 					       selector: selector
 						 object: object1
 						 object: object2
 						 object: object3
 						repeats: false];
-	[[thread runLoop] addTimer: timer];
+	[thread.runLoop addTimer: timer];
 
 	if (waitUntilDone)
 		[timer waitUntilDone];
 
 	objc_autoreleasePoolPop(pool);
@@ -762,11 +762,11 @@
 						 object: object1
 						 object: object2
 						 object: object3
 						 object: object4
 						repeats: false];
-	[[thread runLoop] addTimer: timer];
+	[thread.runLoop addTimer: timer];
 
 	if (waitUntilDone)
 		[timer waitUntilDone];
 
 	objc_autoreleasePoolPop(pool);
@@ -876,14 +876,14 @@
 	       onThread: (OFThread *)thread
 	     afterDelay: (of_time_interval_t)delay
 {
 	void *pool = objc_autoreleasePoolPush();
 
-	[[thread runLoop] addTimer: [OFTimer timerWithTimeInterval: delay
-							    target: self
-							  selector: selector
-							   repeats: false]];
+	[thread.runLoop addTimer: [OFTimer timerWithTimeInterval: delay
+							  target: self
+							selector: selector
+							 repeats: false]];
 
 	objc_autoreleasePoolPop(pool);
 }
 
 - (void)performSelector: (SEL)selector
@@ -891,15 +891,15 @@
 	     withObject: (id)object
 	     afterDelay: (of_time_interval_t)delay
 {
 	void *pool = objc_autoreleasePoolPush();
 
-	[[thread runLoop] addTimer: [OFTimer timerWithTimeInterval: delay
-							    target: self
-							  selector: selector
-							    object: object
-							   repeats: false]];
+	[thread.runLoop addTimer: [OFTimer timerWithTimeInterval: delay
+							  target: self
+							selector: selector
+							  object: object
+							 repeats: false]];
 
 	objc_autoreleasePoolPop(pool);
 }
 
 - (void)performSelector: (SEL)selector
@@ -908,16 +908,16 @@
 	     withObject: (id)object2
 	     afterDelay: (of_time_interval_t)delay
 {
 	void *pool = objc_autoreleasePoolPush();
 
-	[[thread runLoop] addTimer: [OFTimer timerWithTimeInterval: delay
-							    target: self
-							  selector: selector
-							    object: object1
-							    object: object2
-							   repeats: false]];
+	[thread.runLoop addTimer: [OFTimer timerWithTimeInterval: delay
+							  target: self
+							selector: selector
+							  object: object1
+							  object: object2
+							 repeats: false]];
 
 	objc_autoreleasePoolPop(pool);
 }
 
 - (void)performSelector: (SEL)selector
@@ -927,17 +927,17 @@
 	     withObject: (id)object3
 	     afterDelay: (of_time_interval_t)delay
 {
 	void *pool = objc_autoreleasePoolPush();
 
-	[[thread runLoop] addTimer: [OFTimer timerWithTimeInterval: delay
-							    target: self
-							  selector: selector
-							    object: object1
-							    object: object2
-							    object: object3
-							   repeats: false]];
+	[thread.runLoop addTimer: [OFTimer timerWithTimeInterval: delay
+							  target: self
+							selector: selector
+							  object: object1
+							  object: object2
+							  object: object3
+							 repeats: false]];
 
 	objc_autoreleasePoolPop(pool);
 }
 
 - (void)performSelector: (SEL)selector
@@ -948,18 +948,18 @@
 	     withObject: (id)object4
 	     afterDelay: (of_time_interval_t)delay
 {
 	void *pool = objc_autoreleasePoolPush();
 
-	[[thread runLoop] addTimer: [OFTimer timerWithTimeInterval: delay
-							    target: self
-							  selector: selector
-							    object: object1
-							    object: object2
-							    object: object3
-							    object: object4
-							   repeats: false]];
+	[thread.runLoop addTimer: [OFTimer timerWithTimeInterval: delay
+							  target: self
+							selector: selector
+							  object: object1
+							  object: object2
+							  object: object3
+							  object: object4
+							 repeats: false]];
 
 	objc_autoreleasePoolPop(pool);
 }
 #endif
 
@@ -998,11 +998,11 @@
 
 - (OFString *)description
 {
 	/* Classes containing data should reimplement this! */
 
-	return [OFString stringWithFormat: @"<%@>", [self className]];
+	return [OFString stringWithFormat: @"<%@>", self.className];
 }
 
 - (void *)allocMemoryWithSize: (size_t)size
 {
 	void *pointer;