@@ -139,12 +139,11 @@
 static void
 seekOrThrowInvalidFormat(OFSeekableStream *stream,
     of_offset_t offset, int whence)
 {
 	@try {
-		[stream seekToOffset: offset
-			      whence: whence];
+		[stream seekToOffset: offset whence: whence];
 	} @catch (OFSeekFailedException *e) {
 		if (e.errNo == EINVAL)
 			@throw [OFInvalidFormatException exception];
 
 		@throw e;
@@ -152,33 +151,28 @@
 }
 
 @implementation OFZIPArchive
 @synthesize archiveComment = _archiveComment;
 
-+ (instancetype)archiveWithStream: (OFStream *)stream
-			     mode: (OFString *)mode
++ (instancetype)archiveWithStream: (OFStream *)stream mode: (OFString *)mode
 {
-	return [[[self alloc] initWithStream: stream
-					mode: mode] autorelease];
+	return [[[self alloc] initWithStream: stream mode: mode] autorelease];
 }
 
 #ifdef OF_HAVE_FILES
-+ (instancetype)archiveWithPath: (OFString *)path
-			   mode: (OFString *)mode
++ (instancetype)archiveWithPath: (OFString *)path mode: (OFString *)mode
 {
-	return [[[self alloc] initWithPath: path
-				      mode: mode] autorelease];
+	return [[[self alloc] initWithPath: path mode: mode] autorelease];
 }
 #endif
 
 - (instancetype)init
 {
 	OF_INVALID_INIT_METHOD
 }
 
-- (instancetype)initWithStream: (OFStream *)stream
-			  mode: (OFString *)mode
+- (instancetype)initWithStream: (OFStream *)stream mode: (OFString *)mode
 {
 	self = [super init];
 
 	@try {
 		if ([mode isEqual: @"r"])
@@ -223,25 +217,21 @@
 
 	return self;
 }
 
 #ifdef OF_HAVE_FILES
-- (instancetype)initWithPath: (OFString *)path
-			mode: (OFString *)mode
+- (instancetype)initWithPath: (OFString *)path mode: (OFString *)mode
 {
 	OFFile *file;
 
 	if ([mode isEqual: @"a"])
-		file = [[OFFile alloc] initWithPath: path
-					       mode: @"r+"];
+		file = [[OFFile alloc] initWithPath: path mode: @"r+"];
 	else
-		file = [[OFFile alloc] initWithPath: path
-					       mode: mode];
+		file = [[OFFile alloc] initWithPath: path mode: mode];
 
 	@try {
-		self = [self initWithStream: file
-				       mode: mode];
+		self = [self initWithStream: file mode: mode];
 	} @finally {
 		[file release];
 	}
 
 	return self;
@@ -790,12 +780,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
 {
 	size_t ret;
 
 	if (_stream == nil)
 		@throw [OFNotOpenException exceptionWithObject: self];
@@ -812,12 +801,11 @@
 #endif
 
 	if ((uint64_t)length > _toRead)
 		length = (size_t)_toRead;
 
-	ret = [_decompressedStream readIntoBuffer: buffer
-					   length: length];
+	ret = [_decompressedStream readIntoBuffer: buffer length: length];
 
 	_toRead -= ret;
 	_CRC32 = of_crc32(_CRC32, buffer, ret);
 
 	if (_toRead == 0) {
@@ -886,12 +874,11 @@
 	[_entry release];
 
 	[super dealloc];
 }
 
-- (size_t)lowlevelWriteBuffer: (const void *)buffer
-		       length: (size_t)length
+- (size_t)lowlevelWriteBuffer: (const void *)buffer length: (size_t)length
 {
 	size_t bytesWritten;
 
 #if SIZE_MAX >= INT64_MAX
 	if (length > INT64_MAX)
@@ -899,12 +886,11 @@
 #endif
 
 	if (INT64_MAX - _bytesWritten < (int64_t)length)
 		@throw [OFOutOfRangeException exception];
 
-	bytesWritten = [_stream writeBuffer: buffer
-				     length: length];
+	bytesWritten = [_stream writeBuffer: buffer length: length];
 
 	_bytesWritten += (int64_t)bytesWritten;
 	_CRC32 = of_crc32(_CRC32, buffer, length);
 
 	return bytesWritten;