@@ -26,14 +26,14 @@
 
 #import "autorelease.h"
 #import "macros.h"
 
 @implementation OFTimer
-+ scheduledTimerWithTimeInterval: (double)interval
-			  target: (id)target
-			selector: (SEL)selector
-			 repeats: (BOOL)repeats
++ (instancetype)scheduledTimerWithTimeInterval: (double)interval
+					target: (id)target
+				      selector: (SEL)selector
+				       repeats: (BOOL)repeats
 {
 	void *pool = objc_autoreleasePoolPush();
 	OFDate *fireDate = [OFDate dateWithTimeIntervalSinceNow: interval];
 	id timer = [[[self alloc] initWithFireDate: fireDate
 					  interval: interval
@@ -47,15 +47,15 @@
 	objc_autoreleasePoolPop(pool);
 
 	return [timer autorelease];
 }
 
-+ scheduledTimerWithTimeInterval: (double)interval
-			  target: (id)target
-			selector: (SEL)selector
-			  object: (id)object
-			 repeats: (BOOL)repeats
++ (instancetype)scheduledTimerWithTimeInterval: (double)interval
+					target: (id)target
+				      selector: (SEL)selector
+					object: (id)object
+				       repeats: (BOOL)repeats
 {
 	void *pool = objc_autoreleasePoolPush();
 	OFDate *fireDate = [OFDate dateWithTimeIntervalSinceNow: interval];
 	id timer = [[[self alloc] initWithFireDate: fireDate
 					  interval: interval
@@ -70,16 +70,16 @@
 	objc_autoreleasePoolPop(pool);
 
 	return [timer autorelease];
 }
 
-+ scheduledTimerWithTimeInterval: (double)interval
-			  target: (id)target
-			selector: (SEL)selector
-			  object: (id)object1
-			  object: (id)object2
-			 repeats: (BOOL)repeats
++ (instancetype)scheduledTimerWithTimeInterval: (double)interval
+					target: (id)target
+				      selector: (SEL)selector
+					object: (id)object1
+					object: (id)object2
+				       repeats: (BOOL)repeats
 {
 	void *pool = objc_autoreleasePoolPush();
 	OFDate *fireDate = [OFDate dateWithTimeIntervalSinceNow: interval];
 	id timer = [[[self alloc] initWithFireDate: fireDate
 					  interval: interval
@@ -96,13 +96,13 @@
 
 	return [timer autorelease];
 }
 
 #ifdef OF_HAVE_BLOCKS
-+ scheduledTimerWithTimeInterval: (double)interval
-			 repeats: (BOOL)repeats
-			   block: (of_timer_block_t)block
++ (instancetype)scheduledTimerWithTimeInterval: (double)interval
+				       repeats: (BOOL)repeats
+					 block: (of_timer_block_t)block
 {
 	void *pool = objc_autoreleasePoolPush();
 	OFDate *fireDate = [OFDate dateWithTimeIntervalSinceNow: interval];
 	id timer = [[[self alloc] initWithFireDate: fireDate
 					  interval: interval
@@ -116,14 +116,14 @@
 
 	return [timer autorelease];
 }
 #endif
 
-+ timerWithTimeInterval: (double)interval
-		 target: (id)target
-	       selector: (SEL)selector
-		repeats: (BOOL)repeats
++ (instancetype)timerWithTimeInterval: (double)interval
+			       target: (id)target
+			     selector: (SEL)selector
+			      repeats: (BOOL)repeats
 {
 	void *pool = objc_autoreleasePoolPush();
 	OFDate *fireDate = [OFDate dateWithTimeIntervalSinceNow: interval];
 	id timer = [[[self alloc] initWithFireDate: fireDate
 					  interval: interval
@@ -135,15 +135,15 @@
 	objc_autoreleasePoolPop(pool);
 
 	return [timer autorelease];
 }
 
-+ timerWithTimeInterval: (double)interval
-		 target: (id)target
-	       selector: (SEL)selector
-		 object: (id)object
-		repeats: (BOOL)repeats
++ (instancetype)timerWithTimeInterval: (double)interval
+			       target: (id)target
+			     selector: (SEL)selector
+			       object: (id)object
+			      repeats: (BOOL)repeats
 {
 	void *pool = objc_autoreleasePoolPush();
 	OFDate *fireDate = [OFDate dateWithTimeIntervalSinceNow: interval];
 	id timer = [[[self alloc] initWithFireDate: fireDate
 					  interval: interval
@@ -156,16 +156,16 @@
 	objc_autoreleasePoolPop(pool);
 
 	return [timer autorelease];
 }
 
-+ timerWithTimeInterval: (double)interval
-		 target: (id)target
-	       selector: (SEL)selector
-		 object: (id)object1
-		 object: (id)object2
-		repeats: (BOOL)repeats
++ (instancetype)timerWithTimeInterval: (double)interval
+			       target: (id)target
+			     selector: (SEL)selector
+			       object: (id)object1
+			       object: (id)object2
+			      repeats: (BOOL)repeats
 {
 	void *pool = objc_autoreleasePoolPush();
 	OFDate *fireDate = [OFDate dateWithTimeIntervalSinceNow: interval];
 	id timer = [[[self alloc] initWithFireDate: fireDate
 					  interval: interval
@@ -180,13 +180,13 @@
 
 	return [timer autorelease];
 }
 
 #ifdef OF_HAVE_BLOCKS
-+ timerWithTimeInterval: (double)interval
-		repeats: (BOOL)repeats
-		  block: (of_timer_block_t)block
++ (instancetype)timerWithTimeInterval: (double)interval
+			      repeats: (BOOL)repeats
+				block: (of_timer_block_t)block
 {
 	void *pool = objc_autoreleasePoolPush();
 	OFDate *fireDate = [OFDate dateWithTimeIntervalSinceNow: interval];
 	id timer = [[[self alloc] initWithFireDate: fireDate
 					  interval: interval