@@ -84,19 +84,19 @@
 
 	@try {
 		_stream = [stream retain];
 
 		if ([mode isEqual: @"r"])
-			_mode = OF_TAR_ARCHIVE_MODE_READ;
+			_mode = OFTarArchiveModeRead;
 		else if ([mode isEqual: @"w"])
-			_mode = OF_TAR_ARCHIVE_MODE_WRITE;
+			_mode = OFTarArchiveModeWrite;
 		else if ([mode isEqual: @"a"])
-			_mode = OF_TAR_ARCHIVE_MODE_APPEND;
+			_mode = OFTarArchiveModeAppend;
 		else
 			@throw [OFInvalidArgumentException exception];
 
-		if (_mode == OF_TAR_ARCHIVE_MODE_APPEND) {
+		if (_mode == OFTarArchiveModeAppend) {
 			uint32_t buffer[1024 / sizeof(uint32_t)];
 			bool empty = true;
 
 			if (![_stream isKindOfClass: [OFSeekableStream class]])
 				@throw [OFInvalidArgumentException exception];
@@ -114,11 +114,11 @@
 
 			[(OFSeekableStream *)stream seekToOffset: -1024
 							  whence: SEEK_END];
 		}
 
-		_encoding = OF_STRING_ENCODING_UTF_8;
+		_encoding = OFStringEncodingUTF8;
 	} @catch (id e) {
 		[self release];
 		@throw e;
 	}
 
@@ -156,11 +156,11 @@
 {
 	OFTarArchiveEntry *entry;
 	uint32_t buffer[512 / sizeof(uint32_t)];
 	bool empty = true;
 
-	if (_mode != OF_TAR_ARCHIVE_MODE_READ)
+	if (_mode != OFTarArchiveModeRead)
 		@throw [OFInvalidArgumentException exception];
 
 	[(OFTarArchiveFileReadStream *)_lastReturnedStream of_skip];
 	@try {
 		[_lastReturnedStream close];
@@ -200,11 +200,11 @@
 	return entry;
 }
 
 - (OFStream *)streamForReadingCurrentEntry
 {
-	if (_mode != OF_TAR_ARCHIVE_MODE_READ)
+	if (_mode != OFTarArchiveModeRead)
 		@throw [OFInvalidArgumentException exception];
 
 	if (_lastReturnedStream == nil)
 		@throw [OFInvalidArgumentException exception];
 
@@ -214,12 +214,11 @@
 
 - (OFStream *)streamForWritingEntry: (OFTarArchiveEntry *)entry
 {
 	void *pool;
 
-	if (_mode != OF_TAR_ARCHIVE_MODE_WRITE &&
-	    _mode != OF_TAR_ARCHIVE_MODE_APPEND)
+	if (_mode != OFTarArchiveModeWrite && _mode != OFTarArchiveModeAppend)
 		@throw [OFInvalidArgumentException exception];
 
 	pool = objc_autoreleasePoolPush();
 
 	@try {
@@ -253,16 +252,14 @@
 		/* Might have already been closed by the user - that's fine. */
 	}
 	[_lastReturnedStream release];
 	_lastReturnedStream = nil;
 
-	if (_mode == OF_TAR_ARCHIVE_MODE_WRITE ||
-	    _mode == OF_TAR_ARCHIVE_MODE_APPEND) {
+	if (_mode == OFTarArchiveModeWrite || _mode == OFTarArchiveModeAppend) {
 		char buffer[1024];
 		memset(buffer, '\0', 1024);
-		[_stream writeBuffer: buffer
-			      length: 1024];
+		[_stream writeBuffer: buffer length: 1024];
 	}
 
 	[_stream release];
 	_stream = nil;
 }
@@ -360,14 +357,14 @@
 {
 	if (_stream == nil || _skipped)
 		return;
 
 	if ([_stream isKindOfClass: [OFSeekableStream class]] &&
-	    _toRead <= INT64_MAX && (of_offset_t)_toRead == (int64_t)_toRead) {
+	    _toRead <= INT64_MAX && (OFFileOffset)_toRead == (int64_t)_toRead) {
 		uint64_t size;
 
-		[(OFSeekableStream *)_stream seekToOffset: (of_offset_t)_toRead
+		[(OFSeekableStream *)_stream seekToOffset: (OFFileOffset)_toRead
 						   whence: SEEK_CUR];
 
 		_toRead = 0;
 
 		size = _entry.size;