@@ -48,11 +48,11 @@
 	OFMutableDictionary *_dictionary;
 }
 @end
 
 @implementation SimpleDictionary
-- init
+- (instancetype)init
 {
 	self = [super init];
 
 	@try {
 		_dictionary = [[OFMutableDictionary alloc] init];
@@ -62,12 +62,12 @@
 	}
 
 	return self;
 }
 
-- initWithKey: (id)key
-    arguments: (va_list)arguments
+- (instancetype)initWithKey: (id)key
+		  arguments: (va_list)arguments
 {
 	self = [super init];
 
 	@try {
 		_dictionary = [[OFMutableDictionary alloc]
@@ -79,13 +79,13 @@
 	}
 
 	return self;
 }
 
-- initWithObjects: (const id *)objects
-	  forKeys: (const id *)keys_
-	    count: (size_t)count
+- (instancetype)initWithObjects: (const id *)objects
+			forKeys: (const id *)keys_
+			  count: (size_t)count
 {
 	self = [super init];
 
 	@try {
 		_dictionary = [[OFMutableDictionary alloc]