@@ -122,11 +122,11 @@
  *	  OFDictionary.
  *
  * @param dictionary An OFDictionary
  * @return An initialized OFDictionary
  */
-- initWithDictionary:
+- (instancetype)initWithDictionary:
     (OFDictionary OF_GENERIC(KeyType, ObjectType) *)dictionary;
 
 /*!
  * @brief Initializes an already allocated OFDictionary with the specified key
  *	  and object.
@@ -133,23 +133,23 @@
  *
  * @param key The key
  * @param object The object
  * @return An initialized OFDictionary
  */
-- initWithObject: (ObjectType)object
-	  forKey: (KeyType)key;
+- (instancetype)initWithObject: (ObjectType)object
+			forKey: (KeyType)key;
 
 /*!
  * @brief Initializes an already allocated OFDictionary with the specified keys
  *	  and objects.
  *
  * @param keys An array of keys
  * @param objects An array of objects
  * @return An initialized OFDictionary
  */
-- initWithObjects: (OFArray OF_GENERIC(ObjectType) *)objects
-	  forKeys: (OFArray OF_GENERIC(KeyType) *)keys;
+- (instancetype)initWithObjects: (OFArray OF_GENERIC(ObjectType) *)objects
+			forKeys: (OFArray OF_GENERIC(KeyType) *)keys;
 
 /*!
  * @brief Initializes an already allocated OFDictionary with the specified keys
  *	  and objects.
  *
@@ -156,33 +156,33 @@
  * @param keys An array of keys
  * @param objects An array of objects
  * @param count The number of objects in the arrays
  * @return An initialized OFDictionary
  */
-- initWithObjects: (ObjectType const _Nonnull *_Nonnull)objects
-	  forKeys: (KeyType const _Nonnull *_Nonnull)keys
-	    count: (size_t)count;
+- (instancetype)initWithObjects: (ObjectType const _Nonnull *_Nonnull)objects
+			forKeys: (KeyType const _Nonnull *_Nonnull)keys
+			  count: (size_t)count;
 
 /*!
  * @brief Initializes an already allocated OFDictionary with the specified keys
  *	  and objects.
  *
  * @param firstKey The first key
  * @return An initialized OFDictionary
  */
-- initWithKeysAndObjects: (KeyType)firstKey, ... OF_SENTINEL;
+- (instancetype)initWithKeysAndObjects: (KeyType)firstKey, ... OF_SENTINEL;
 
 /*!
  * @brief Initializes an already allocated OFDictionary with the specified key
  *	  and va_list.
  *
  * @param firstKey The first key
  * @param arguments A va_list of the other arguments
  * @return An initialized OFDictionary
  */
-- initWithKey: (KeyType)firstKey
-    arguments: (va_list)arguments;
+- (instancetype)initWithKey: (KeyType)firstKey
+		  arguments: (va_list)arguments;
 
 /*!
  * @brief Returns the object for the given key or `nil` if the key was not
  *	  found.
  *