@@ -266,21 +266,17 @@
 
 	keyEnumerator = [environment keyEnumerator];
 	objectEnumerator = [environment objectEnumerator];
 	while ((key = [keyEnumerator nextObject]) != nil &&
 	    (object = [objectEnumerator nextObject]) != nil) {
-		[env addItems: key.UTF16String
-			count: key.UTF16StringLength];
-		[env addItems: &equal
-			count: 1];
+		[env addItems: key.UTF16String count: key.UTF16StringLength];
+		[env addItems: &equal count: 1];
 		[env addItems: object.UTF16String
 			count: object.UTF16StringLength];
-		[env addItems: &zero
-			count: 1];
+		[env addItems: &zero count: 1];
 	}
-	[env addItems: zero
-		count: 2];
+	[env addItems: zero count: 2];
 
 	return env.mutableItems;
 }
 
 - (char *)of_environmentForDictionary: (OFDictionary *)environment
@@ -299,19 +295,16 @@
 	objectEnumerator = [environment objectEnumerator];
 	while ((key = [keyEnumerator nextObject]) != nil &&
 	    (object = [objectEnumerator nextObject]) != nil) {
 		[env addItems: [key cStringWithEncoding: encoding]
 			count: [key cStringLengthWithEncoding: encoding]];
-		[env addItems: "="
-			count: 1];
+		[env addItems: "=" count: 1];
 		[env addItems: [object cStringWithEncoding: encoding]
 			count: [object cStringLengthWithEncoding: encoding]];
-		[env addItems: ""
-			count: 1];
+		[env addItems: "" count: 1];
 	}
-	[env addItems: "\0"
-		count: 2];
+	[env addItems: "\0" count: 2];
 
 	return env.mutableItems;
 }
 
 - (bool)lowlevelIsAtEndOfStream
@@ -320,12 +313,11 @@
 		@throw [OFNotOpenException exceptionWithObject: self];
 
 	return _atEndOfStream;
 }
 
-- (size_t)lowlevelReadIntoBuffer: (void *)buffer
-			  length: (size_t)length
+- (size_t)lowlevelReadIntoBuffer: (void *)buffer length: (size_t)length
 {
 	DWORD ret;
 
 	if (length > UINT32_MAX)
 		@throw [OFOutOfRangeException exception];
@@ -348,12 +340,11 @@
 		_atEndOfStream = true;
 
 	return ret;
 }
 
-- (size_t)lowlevelWriteBuffer: (const void *)buffer
-		       length: (size_t)length
+- (size_t)lowlevelWriteBuffer: (const void *)buffer length: (size_t)length
 {
 	DWORD bytesWritten;
 
 	if (length > UINT32_MAX)
 		@throw [OFOutOfRangeException exception];