@@ -32,18 +32,20 @@
  * @brief A protocol that needs to be implemented by delegates for OFXMLParser.
  */
 @protocol OFXMLParserDelegate <OFObject>
 @optional
 /**
- * @brief This callback is called when the XML parser found processing
- *	  instructions.
- *
- * @param parser The parser which found processing instructions
- * @param processingInstructions The processing instructions
- */
--		 (void)parser: (OFXMLParser *)parser
-  foundProcessingInstructions: (OFString *)processingInstructions;
+ * @brief This callback is called when the XML parser found a processing
+ *	  instruction.
+ *
+ * @param parser The parser which found a processing instruction
+ * @param target The target of the processing instruction
+ * @param data The data of the processing instruction
+ */
+-			  (void)parser: (OFXMLParser *)parser
+  foundProcessingInstructionWithTarget: (OFString *)target
+				  data: (OFString *)data;
 
 /**
  * @brief This callback is called when the XML parser found the start of a new
  *	  tag.
  *
@@ -80,30 +82,27 @@
  * called multiple times in a row.
  *
  * @param parser The parser which found a string
  * @param characters The characters the XML parser found
  */
--    (void)parser: (OFXMLParser *)parser
-  foundCharacters: (OFString *)characters;
+- (void)parser: (OFXMLParser *)parser foundCharacters: (OFString *)characters;
 
 /**
  * @brief This callback is called when the XML parser found CDATA.
  *
  * @param parser The parser which found a string
  * @param CDATA The CDATA the XML parser found
  */
-- (void)parser: (OFXMLParser *)parser
-    foundCDATA: (OFString *)CDATA;
+- (void)parser: (OFXMLParser *)parser foundCDATA: (OFString *)CDATA;
 
 /**
  * @brief This callback is called when the XML parser found a comment.
  *
  * @param parser The parser which found a comment
  * @param comment The comment the XML parser found
  */
-- (void)parser: (OFXMLParser *)parser
-  foundComment: (OFString *)comment;
+- (void)parser: (OFXMLParser *)parser foundComment: (OFString *)comment;
 
 /**
  * @brief This callback is called when the XML parser found an entity it
  *	  doesn't know.
  *
@@ -129,32 +128,11 @@
  */
 OF_SUBCLASSING_RESTRICTED
 @interface OFXMLParser: OFObject
 {
 	id <OFXMLParserDelegate> _Nullable _delegate;
-	enum of_xml_parser_state {
-		OF_XMLPARSER_IN_BYTE_ORDER_MARK,
-		OF_XMLPARSER_OUTSIDE_TAG,
-		OF_XMLPARSER_TAG_OPENED,
-		OF_XMLPARSER_IN_PROCESSING_INSTRUCTIONS,
-		OF_XMLPARSER_IN_TAG_NAME,
-		OF_XMLPARSER_IN_CLOSE_TAG_NAME,
-		OF_XMLPARSER_IN_TAG,
-		OF_XMLPARSER_IN_ATTRIBUTE_NAME,
-		OF_XMLPARSER_EXPECT_ATTRIBUTE_EQUAL_SIGN,
-		OF_XMLPARSER_EXPECT_ATTRIBUTE_DELIMITER,
-		OF_XMLPARSER_IN_ATTRIBUTE_VALUE,
-		OF_XMLPARSER_EXPECT_TAG_CLOSE,
-		OF_XMLPARSER_EXPECT_SPACE_OR_TAG_CLOSE,
-		OF_XMLPARSER_IN_EXCLAMATION_MARK,
-		OF_XMLPARSER_IN_CDATA_OPENING,
-		OF_XMLPARSER_IN_CDATA,
-		OF_XMLPARSER_IN_COMMENT_OPENING,
-		OF_XMLPARSER_IN_COMMENT_1,
-		OF_XMLPARSER_IN_COMMENT_2,
-		OF_XMLPARSER_IN_DOCTYPE
-	} _state;
+	uint_least8_t _state;
 	size_t _i, _last;
 	const char *_Nullable _data;
 	OFMutableData *_buffer;
 	OFString *_Nullable _name, *_Nullable _prefix;
 	OFMutableArray
@@ -166,11 +144,11 @@
 	OFMutableArray OF_GENERIC(OFString *) *_previous;
 	size_t _level;
 	bool _acceptProlog;
 	size_t _lineNumber;
 	bool _lastCarriageReturn, _finishedParsing;
-	of_string_encoding_t _encoding;
+	OFStringEncoding _encoding;
 	size_t _depthLimit;
 }
 
 /**
  * @brief The delegate that is used by the XML parser.
@@ -208,12 +186,11 @@
  * @brief Parses the specified buffer with the specified size.
  *
  * @param buffer The buffer to parse
  * @param length The length of the buffer
  */
-- (void)parseBuffer: (const char *)buffer
-	     length: (size_t)length;
+- (void)parseBuffer: (const char *)buffer length: (size_t)length;
 
 /**
  * @brief Parses the specified string.
  *
  * @param string The string to parse