@@ -28,47 +28,47 @@
 
 @interface OFMutableDictionary_placeholder: OFDictionary
 @end
 
 @implementation OFMutableDictionary_placeholder
-- init
+- (instancetype)init
 {
 	return (id)[[OFMutableDictionary_hashtable alloc] init];
 }
 
-- initWithDictionary: (OFDictionary *)dictionary
+- (instancetype)initWithDictionary: (OFDictionary *)dictionary
 {
 	return (id)[[OFMutableDictionary_hashtable alloc]
 	    initWithDictionary: dictionary];
 }
 
-- initWithObject: (id)object
-	  forKey: (id)key
+- (instancetype)initWithObject: (id)object
+			forKey: (id)key
 {
 	return (id)[[OFMutableDictionary_hashtable alloc] initWithObject: object
 								  forKey: key];
 }
 
-- initWithObjects: (OFArray *)objects
-	  forKeys: (OFArray *)keys
+- (instancetype)initWithObjects: (OFArray *)objects
+			forKeys: (OFArray *)keys
 {
 	return (id)[[OFMutableDictionary_hashtable alloc]
 	    initWithObjects: objects
 		    forKeys: keys];
 }
 
-- initWithObjects: (id const *)objects
-	  forKeys: (id const *)keys
-	    count: (size_t)count
+- (instancetype)initWithObjects: (id const *)objects
+			forKeys: (id const *)keys
+			  count: (size_t)count
 {
 	return (id)[[OFMutableDictionary_hashtable alloc]
 	    initWithObjects: objects
 		    forKeys: keys
 		      count: count];
 }
 
-- initWithKeysAndObjects: (id)firstKey, ...
+- (instancetype)initWithKeysAndObjects: (id)firstKey, ...
 {
 	id ret;
 	va_list arguments;
 
 	va_start(arguments, firstKey);
@@ -78,36 +78,36 @@
 	va_end(arguments);
 
 	return ret;
 }
 
-- initWithKey: (id)firstKey
-    arguments: (va_list)arguments
+- (instancetype)initWithKey: (id)firstKey
+		  arguments: (va_list)arguments
 {
 	return (id)[[OFMutableDictionary_hashtable alloc]
 	    initWithKey: firstKey
 	      arguments: arguments];
 }
 
-- initWithSerialization: (OFXMLElement *)element
+- (instancetype)initWithSerialization: (OFXMLElement *)element
 {
 	return (id)[[OFMutableDictionary_hashtable alloc]
 	    initWithSerialization: element];
 }
 
-- initWithCapacity: (size_t)capacity
+- (instancetype)initWithCapacity: (size_t)capacity
 {
 	return (id)[[OFMutableDictionary_hashtable alloc]
 	    initWithCapacity: capacity];
 }
 
-- retain
+- (instancetype)retain
 {
 	return self;
 }
 
-- autorelease
+- (instancetype)autorelease
 {
 	return self;
 }
 
 - (void)release
@@ -125,11 +125,11 @@
 {
 	if (self == [OFMutableDictionary class])
 		placeholder.isa = [OFMutableDictionary_placeholder class];
 }
 
-+ alloc
++ (instancetype)alloc
 {
 	if (self == [OFMutableDictionary class])
 		return (id)&placeholder;
 
 	return [super alloc];
@@ -138,11 +138,11 @@
 + (instancetype)dictionaryWithCapacity: (size_t)capacity
 {
 	return [[[self alloc] initWithCapacity: capacity] autorelease];
 }
 
-- init
+- (instancetype)init
 {
 	if (object_getClass(self) == [OFMutableDictionary class]) {
 		@try {
 			[self doesNotRecognizeSelector: _cmd];
 		} @catch (id e) {
@@ -154,11 +154,11 @@
 	}
 
 	return [super init];
 }
 
-- initWithCapacity: (size_t)capacity
+- (instancetype)initWithCapacity: (size_t)capacity
 {
 	OF_INVALID_INIT_METHOD
 }
 
 - (void)setObject: (id)object
@@ -187,11 +187,11 @@
 		[self removeObjectForKey: key];
 
 	objc_autoreleasePoolPop(pool);
 }
 
-- copy
+- (id)copy
 {
 	return [[OFDictionary alloc] initWithDictionary: self];
 }
 
 - (void)addEntriesFromDictionary: (OFDictionary *)dictionary