@@ -122,12 +122,11 @@
 	}
 
 	return self;
 }
 
-- (size_t)lowlevelReadIntoBuffer: (void *)buffer_
-			  length: (size_t)length
+- (size_t)lowlevelReadIntoBuffer: (void *)buffer_ length: (size_t)length
 {
 	void *pool = objc_autoreleasePoolPush();
 	char *buffer = buffer_;
 	of_char16_t *UTF16;
 	size_t j = 0;
@@ -188,12 +187,11 @@
 				j += UTF8Len;
 			} else {
 				if (rest == nil)
 					rest = [OFMutableData data];
 
-				[rest addItems: UTF8
-					 count: UTF8Len];
+				[rest addItems: UTF8 count: UTF8Len];
 			}
 
 			_incompleteUTF16Surrogate = 0;
 			i++;
 		}
@@ -246,29 +244,26 @@
 				j += UTF8Len;
 			} else {
 				if (rest == nil)
 					rest = [OFMutableData data];
 
-				[rest addItems: UTF8
-					 count: UTF8Len];
+				[rest addItems: UTF8 count: UTF8Len];
 			}
 		}
 
 		if (rest != nil)
-			[self unreadFromBuffer: rest.items
-					length: rest.count];
+			[self unreadFromBuffer: rest.items length: rest.count];
 	} @finally {
 		free(UTF16);
 	}
 
 	objc_autoreleasePoolPop(pool);
 
 	return j;
 }
 
-- (size_t)lowlevelWriteBuffer: (const void *)buffer_
-		       length: (size_t)length
+- (size_t)lowlevelWriteBuffer: (const void *)buffer_ length: (size_t)length
 {
 	const char *buffer = buffer_;
 	of_char16_t *tmp;
 	size_t i = 0, j = 0;
 
@@ -489,14 +484,11 @@
 		return;
 
 	csbi.wAttributes &= ~(FOREGROUND_RED | FOREGROUND_GREEN |
 	    FOREGROUND_BLUE | FOREGROUND_INTENSITY);
 
-	[color getRed: &red
-		green: &green
-		 blue: &blue
-		alpha: NULL];
+	[color getRed: &red green: &green blue: &blue alpha: NULL];
 
 	if (red >= 0.25)
 		csbi.wAttributes |= FOREGROUND_RED;
 	if (green >= 0.25)
 		csbi.wAttributes |= FOREGROUND_GREEN;
@@ -518,14 +510,11 @@
 		return;
 
 	csbi.wAttributes &= ~(BACKGROUND_RED | BACKGROUND_GREEN |
 	    BACKGROUND_BLUE | BACKGROUND_INTENSITY);
 
-	[color getRed: &red
-		green: &green
-		 blue: &blue
-		alpha: NULL];
+	[color getRed: &red green: &green blue: &blue alpha: NULL];
 
 	if (red >= 0.25)
 		csbi.wAttributes |= BACKGROUND_RED;
 	if (green >= 0.25)
 		csbi.wAttributes |= BACKGROUND_GREEN;