@@ -92,19 +92,17 @@
 static OF_INLINE void
 appendToBuffer(OFMutableData *buffer, const char *string,
     of_string_encoding_t encoding, size_t length)
 {
 	if OF_LIKELY(encoding == OF_STRING_ENCODING_UTF_8)
-		[buffer addItems: string
-			   count: length];
+		[buffer addItems: string count: length];
 	else {
 		void *pool = objc_autoreleasePoolPush();
 		OFString *tmp = [OFString stringWithCString: string
 						   encoding: encoding
 						     length: length];
-		[buffer addItems: tmp.UTF8String
-			   count: tmp.UTF8StringLength];
+		[buffer addItems: tmp.UTF8String count: tmp.UTF8StringLength];
 		objc_autoreleasePoolPop(pool);
 	}
 }
 
 static OFString *
@@ -128,12 +126,11 @@
 				items[i] = '\n';
 		} else if (items[i] == '&')
 			hasEntities = true;
 	}
 
-	ret = [OFString stringWithUTF8String: items
-				      length: length];
+	ret = [OFString stringWithUTF8String: items length: length];
 
 	if (unescape && hasEntities) {
 		@try {
 			return [ret stringByXMLUnescapingWithDelegate: parser];
 		} @catch (OFInvalidFormatException *e) {
@@ -238,12 +235,11 @@
 	[_previous release];
 
 	[super dealloc];
 }
 
-- (void)parseBuffer: (const char *)buffer
-	     length: (size_t)length
+- (void)parseBuffer: (const char *)buffer length: (size_t)length
 {
 	_data = buffer;
 
 	for (_i = _last = 0; _i < length; _i++) {
 		size_t j = _i;
@@ -267,12 +263,11 @@
 		    length - _last);
 }
 
 - (void)parseString: (OFString *)string
 {
-	[self parseBuffer: string.UTF8String
-		   length: string.UTF8StringLength];
+	[self parseBuffer: string.UTF8String length: string.UTF8StringLength];
 }
 
 - (void)parseStream: (OFStream *)stream
 {
 	size_t pageSize = [OFSystemInfo pageSize];
@@ -280,13 +275,11 @@
 
 	@try {
 		while (!stream.atEndOfStream) {
 			size_t length = [stream readIntoBuffer: buffer
 							length: pageSize];
-
-			[self parseBuffer: buffer
-				   length: length];
+			[self parseBuffer: buffer length: length];
 		}
 	} @finally {
 		free(buffer);
 	}
 }
@@ -501,11 +494,11 @@
 				@throw [OFMalformedXMLException
 				    exceptionWithParser: self];
 
 		if ([self->_delegate respondsToSelector:
 		    @selector(parser:foundProcessingInstructions:)])
-			[self->_delegate	 parser: self
+			[self->_delegate parser: self
 			    foundProcessingInstructions: PI];
 
 		objc_autoreleasePoolPop(pool);
 
 		[self->_buffer removeAllItems];
@@ -955,12 +948,11 @@
 		    self->_encoding, self->_i - self->_last);
 		CDATA = transformString(self, self->_buffer, 2, false);
 
 		if ([self->_delegate respondsToSelector:
 		    @selector(parser:foundCDATA:)])
-			[self->_delegate parser: self
-				     foundCDATA: CDATA];
+			[self->_delegate parser: self foundCDATA: CDATA];
 
 		objc_autoreleasePoolPop(pool);
 
 		[self->_buffer removeAllItems];
 
@@ -1009,12 +1001,11 @@
 	    self->_encoding, self->_i - self->_last);
 	comment = transformString(self, self->_buffer, 2, false);
 
 	if ([self->_delegate respondsToSelector:
 	    @selector(parser:foundComment:)])
-		[self->_delegate parser: self
-			   foundComment: comment];
+		[self->_delegate parser: self foundComment: comment];
 
 	objc_autoreleasePoolPop(pool);
 
 	[self->_buffer removeAllItems];
 
@@ -1054,11 +1045,10 @@
 -	  (OFString *)string: (OFString *)string
   containsUnknownEntityNamed: (OFString *)entity
 {
 	if ([_delegate respondsToSelector:
 	    @selector(parser:foundUnknownEntityNamed:)])
-		return [_delegate parser: self
-		 foundUnknownEntityNamed: entity];
+		return [_delegate parser: self foundUnknownEntityNamed: entity];
 
 	return nil;
 }
 @end