@@ -59,33 +59,28 @@
 @end
 
 @implementation OFTarArchive: OFObject
 @synthesize encoding = _encoding;
 
-+ (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 {
 		_stream = [stream retain];
@@ -106,12 +101,11 @@
 			if (![_stream isKindOfClass: [OFSeekableStream class]])
 				@throw [OFInvalidArgumentException exception];
 
 			[(OFSeekableStream *)_stream seekToOffset: -1024
 							   whence: SEEK_END];
-			[_stream readIntoBuffer: buffer
-				    exactLength: 1024];
+			[_stream readIntoBuffer: buffer exactLength: 1024];
 
 			for (size_t i = 0; i < 1024 / sizeof(uint32_t); i++)
 				if (buffer[i] != 0)
 					empty = false;
 
@@ -130,25 +124,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;
@@ -181,20 +171,18 @@
 	_lastReturnedStream = nil;
 
 	if (_stream.atEndOfStream)
 		return nil;
 
-	[_stream readIntoBuffer: buffer
-		    exactLength: 512];
+	[_stream readIntoBuffer: buffer exactLength: 512];
 
 	for (size_t i = 0; i < 512 / sizeof(uint32_t); i++)
 		if (buffer[i] != 0)
 			empty = false;
 
 	if (empty) {
-		[_stream readIntoBuffer: buffer
-			    exactLength: 512];
+		[_stream readIntoBuffer: buffer exactLength: 512];
 
 		for (size_t i = 0; i < 512 / sizeof(uint32_t); i++)
 			if (buffer[i] != 0)
 				@throw [OFInvalidFormatException exception];
 
@@ -240,12 +228,11 @@
 		/* Might have already been closed by the user - that's fine. */
 	}
 	[_lastReturnedStream release];
 	_lastReturnedStream = nil;
 
-	[entry of_writeToStream: _stream
-		       encoding: _encoding];
+	[entry of_writeToStream: _stream encoding: _encoding];
 
 	_lastReturnedStream = [[OFTarArchiveFileWriteStream alloc]
 	    of_initWithStream: _stream
 			entry: entry];
 
@@ -326,13 +313,11 @@
 #endif
 
 	if ((uint64_t)length > _toRead)
 		length = (size_t)_toRead;
 
-	ret = [_stream readIntoBuffer: buffer
-			       length: length];
-
+	ret = [_stream readIntoBuffer: buffer length: length];
 	if (ret == 0)
 		_atEndOfStream = true;
 
 	_toRead -= ret;
 
@@ -394,12 +379,11 @@
 	} else {
 		char buffer[512];
 		uint64_t size;
 
 		while (_toRead >= 512) {
-			[_stream readIntoBuffer: buffer
-				    exactLength: 512];
+			[_stream readIntoBuffer: buffer exactLength: 512];
 			_toRead -= 512;
 		}
 
 		if (_toRead > 0) {
 			[_stream readIntoBuffer: buffer
@@ -444,12 +428,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 (_stream == nil)
 		@throw [OFNotOpenException exceptionWithObject: self];