@@ -66,12 +66,11 @@
 
 	if ((i = of_string_utf8_encode(c, buffer)) == 0)
 		return nil;
 	buffer[i] = 0;
 
-	return [OFString stringWithUTF8String: buffer
-				       length: i];
+	return [OFString stringWithUTF8String: buffer length: i];
 }
 
 static OFString *
 parseEntities(OFString *self, id (*lookup)(void *, OFString *, OFString *),
     void *context)
@@ -92,13 +91,11 @@
 	last = 0;
 	inEntity = false;
 
 	for (i = 0; i < length; i++) {
 		if (!inEntity && string[i] == '&') {
-			[ret appendUTF8String: string + last
-				       length: i - last];
-
+			[ret appendUTF8String: string + last length: i - last];
 			last = i + 1;
 			inEntity = true;
 		} else if (inEntity && string[i] == ';') {
 			const char *entity = string + last;
 			size_t entityLength = i - last;
@@ -168,13 +165,11 @@
 	}
 
 	if (inEntity)
 		@throw [OFInvalidFormatException exception];
 
-	[ret appendUTF8String: string + last
-		       length: i - last];
-
+	[ret appendUTF8String: string + last length: i - last];
 	[ret makeImmutable];
 
 	objc_autoreleasePoolPop(pool);
 
 	return ret;
@@ -186,12 +181,11 @@
 	id <OFStringXMLUnescapingDelegate> delegate = context;
 
 	if (delegate == nil)
 		return nil;
 
-	return [delegate        string: self
-	    containsUnknownEntityNamed: entity];
+	return [delegate string: self containsUnknownEntityNamed: entity];
 }
 
 #ifdef OF_HAVE_BLOCKS
 static id
 lookupUsingBlock(void *context, OFString *self, OFString *entity)