@@ -51,46 +51,46 @@
 /**
  * \brief Creates a new OFArray.
  *
  * \return A new autoreleased OFArray
  */
-+ array;
++ (instancetype)array;
 
 /**
  * \brief Creates a new OFArray with the specified object.
  *
  * \param object An object
  * \return A new autoreleased OFArray
  */
-+ arrayWithObject: (id)object;
++ (instancetype)arrayWithObject: (id)object;
 
 /**
  * \brief Creates a new OFArray with the specified objects, terminated by nil.
  *
  * \param firstObject The first object in the array
  * \return A new autoreleased OFArray
  */
-+ arrayWithObjects: (id)firstObject, ...;
++ (instancetype)arrayWithObjects: (id)firstObject, ...;
 
 /**
  * \brief Creates a new OFArray with the objects from the specified array.
  *
  * \param array An array
  * \return A new autoreleased OFArray
  */
-+ arrayWithArray: (OFArray*)array;
++ (instancetype)arrayWithArray: (OFArray*)array;
 
 /**
  * \brief Creates a new OFArray with the objects from the specified C array of
  *	  the specified length.
  *
  * \param objects A C array of objects
  * \param length The length of the C array
  * \return A new autoreleased OFArray
  */
-+ arrayWithObjects: (id const*)objects
-	     count: (size_t)count;
++ (instancetype)arrayWithObjects: (id const*)objects
+			   count: (size_t)count;
 
 /**
  * \brief Initializes an OFArray with the specified object.
  *
  * \param object An object