@@ -48,33 +48,33 @@
  * \brief Creates a new XML element with the specified name.
  *
  * \param name The name for the element
  * \return A new autoreleased OFXMLElement with the specified element name
  */
-+ elementWithName: (OFString*)name;
++ (instancetype)elementWithName: (OFString*)name;
 
 /**
  * \brief Creates a new XML element with the specified name and string value.
  *
  * \param name The name for the element
  * \param stringValue The value for the element
  * \return A new autoreleased OFXMLElement with the specified element name and
  *	   value
  */
-+ elementWithName: (OFString*)name
-      stringValue: (OFString*)stringValue;
++ (instancetype)elementWithName: (OFString*)name
+		    stringValue: (OFString*)stringValue;
 
 /**
  * \brief Creates a new XML element with the specified name and namespace.
  *
  * \param name The name for the element
  * \param ns The namespace for the element
  * \return A new autoreleased OFXMLElement with the specified element name and
  *	   namespace
  */
-+ elementWithName: (OFString*)name
-	namespace: (OFString*)ns;
++ (instancetype)elementWithName: (OFString*)name
+		      namespace: (OFString*)ns;
 
 /**
  * \brief Creates a new XML element with the specified name, namespace and
  * 	  string value.
  *
@@ -82,39 +82,39 @@
  * \param ns The namespace for the element
  * \param stringValue The value for the element
  * \return A new autoreleased OFXMLElement with the specified element name,
  *	   namespace and value
  */
-+ elementWithName: (OFString*)name
-	namespace: (OFString*)ns
-      stringValue: (OFString*)stringValue;
++ (instancetype)elementWithName: (OFString*)name
+		      namespace: (OFString*)ns
+		    stringValue: (OFString*)stringValue;
 
 /**
  * \brief Creates a new element with the specified element.
  *
  * \param element An OFXMLElement to initialize the OFXMLElement with
  * \return A new autoreleased OFXMLElement with the contents of the specified
  *	   element
  */
-+ elementWithElement: (OFXMLElement*)element;
++ (instancetype)elementWithElement: (OFXMLElement*)element;
 
 /**
  * \brief Parses the string and returns an OFXMLElement for it.
  *
  * \param string The string to parse
  * \return A new autoreleased OFXMLElement with the contents of the string
  */
-+ elementWithXMLString: (OFString*)string;
++ (instancetype)elementWithXMLString: (OFString*)string;
 
 /**
  * \brief Parses the specified file and returns an OFXMLElement for it.
  *
  * \param path The path to the file
  * \return A new autoreleased OFXMLElement with the contents of the specified
  *	   file
  */
-+ elementWithFile: (OFString*)path;
++ (instancetype)elementWithFile: (OFString*)path;
 
 /**
  * \brief Initializes an already allocated OFXMLElement with the specified name.
  *
  * \param name The name for the element