@@ -313,11 +313,11 @@
 
 	return [timer autorelease];
 }
 #endif
 
-- init
+- (instancetype)init
 {
 	OF_INVALID_INIT_METHOD
 }
 
 - (instancetype)of_initWithFireDate: (OFDate *)fireDate
@@ -354,15 +354,15 @@
 	}
 
 	return self;
 }
 
-- initWithFireDate: (OFDate *)fireDate
-	  interval: (of_time_interval_t)interval
-	    target: (id)target
-	  selector: (SEL)selector
-	   repeats: (bool)repeats
+- (instancetype)initWithFireDate: (OFDate *)fireDate
+			interval: (of_time_interval_t)interval
+			  target: (id)target
+			selector: (SEL)selector
+			 repeats: (bool)repeats
 {
 	return [self of_initWithFireDate: fireDate
 				interval: interval
 				  target: target
 				selector: selector
@@ -372,16 +372,16 @@
 				  object: nil
 			       arguments: 0
 				 repeats: repeats];
 }
 
-- initWithFireDate: (OFDate *)fireDate
-	  interval: (of_time_interval_t)interval
-	    target: (id)target
-	  selector: (SEL)selector
-	    object: (id)object
-	   repeats: (bool)repeats
+- (instancetype)initWithFireDate: (OFDate *)fireDate
+			interval: (of_time_interval_t)interval
+			  target: (id)target
+			selector: (SEL)selector
+			  object: (id)object
+			 repeats: (bool)repeats
 {
 	return [self of_initWithFireDate: fireDate
 				interval: interval
 				  target: target
 				selector: selector
@@ -391,17 +391,17 @@
 				  object: nil
 			       arguments: 1
 				 repeats: repeats];
 }
 
-- initWithFireDate: (OFDate *)fireDate
-	  interval: (of_time_interval_t)interval
-	    target: (id)target
-	  selector: (SEL)selector
-	    object: (id)object1
-	    object: (id)object2
-	   repeats: (bool)repeats
+- (instancetype)initWithFireDate: (OFDate *)fireDate
+			interval: (of_time_interval_t)interval
+			  target: (id)target
+			selector: (SEL)selector
+			  object: (id)object1
+			  object: (id)object2
+			 repeats: (bool)repeats
 {
 	return [self of_initWithFireDate: fireDate
 				interval: interval
 				  target: target
 				selector: selector
@@ -411,18 +411,18 @@
 				  object: nil
 			       arguments: 2
 				 repeats: repeats];
 }
 
-- initWithFireDate: (OFDate *)fireDate
-	  interval: (of_time_interval_t)interval
-	    target: (id)target
-	  selector: (SEL)selector
-	    object: (id)object1
-	    object: (id)object2
-	    object: (id)object3
-	   repeats: (bool)repeats
+- (instancetype)initWithFireDate: (OFDate *)fireDate
+			interval: (of_time_interval_t)interval
+			  target: (id)target
+			selector: (SEL)selector
+			  object: (id)object1
+			  object: (id)object2
+			  object: (id)object3
+			 repeats: (bool)repeats
 {
 	return [self of_initWithFireDate: fireDate
 				interval: interval
 				  target: target
 				selector: selector
@@ -432,19 +432,19 @@
 				  object: nil
 			       arguments: 3
 				 repeats: repeats];
 }
 
-- initWithFireDate: (OFDate *)fireDate
-	  interval: (of_time_interval_t)interval
-	    target: (id)target
-	  selector: (SEL)selector
-	    object: (id)object1
-	    object: (id)object2
-	    object: (id)object3
-	    object: (id)object4
-	   repeats: (bool)repeats
+- (instancetype)initWithFireDate: (OFDate *)fireDate
+			interval: (of_time_interval_t)interval
+			  target: (id)target
+			selector: (SEL)selector
+			  object: (id)object1
+			  object: (id)object2
+			  object: (id)object3
+			  object: (id)object4
+			 repeats: (bool)repeats
 {
 	return [self of_initWithFireDate: fireDate
 				interval: interval
 				  target: target
 				selector: selector
@@ -455,14 +455,14 @@
 			       arguments: 4
 				 repeats: repeats];
 }
 
 #ifdef OF_HAVE_BLOCKS
-- initWithFireDate: (OFDate *)fireDate
-	   interval: (of_time_interval_t)interval
-	    repeats: (bool)repeats
-	      block: (of_timer_block_t)block
+- (instancetype)initWithFireDate: (OFDate *)fireDate
+			interval: (of_time_interval_t)interval
+			 repeats: (bool)repeats
+			   block: (of_timer_block_t)block
 {
 	self = [super init];
 
 	@try {
 		_fireDate = [fireDate retain];