@@ -107,11 +107,11 @@
 	OFTarArchiveEntry *entry;
 
 	while ((entry = [_archive nextEntry]) != nil) {
 		void *pool = objc_autoreleasePoolPush();
 
-		[of_stdout writeLine: entry.fileName];
+		[OFStdOut writeLine: entry.fileName];
 
 		if (app->_outputLevel >= 1) {
 			OFString *date = [entry.modificationDate
 			    localDateStringWithFormat: @"%Y-%m-%d %H:%M:%S"];
 			OFString *size = [OFString stringWithFormat:
@@ -121,80 +121,80 @@
 			OFString *UID = [OFString stringWithFormat:
 			    @"%u", entry.UID];
 			OFString *GID = [OFString stringWithFormat:
 			    @"%u", entry.GID];
 
-			[of_stdout writeString: @"\t"];
-			[of_stdout writeLine: OF_LOCALIZED(@"list_size",
+			[OFStdOut writeString: @"\t"];
+			[OFStdOut writeLine: OF_LOCALIZED(@"list_size",
 			    @"["
 			    @"    'Size: ',"
 			    @"    ["
 			    @"        {'size == 1': '1 byte'},"
 			    @"        {'': '%[size] bytes'}"
 			    @"    ]"
 			    @"]".objectByParsingJSON,
 			    @"size", size)];
-			[of_stdout writeString: @"\t"];
-			[of_stdout writeLine: OF_LOCALIZED(@"list_mode",
+			[OFStdOut writeString: @"\t"];
+			[OFStdOut writeLine: OF_LOCALIZED(@"list_mode",
 			    @"Mode: %[mode]",
 			    @"mode", mode)];
-			[of_stdout writeString: @"\t"];
-			[of_stdout writeLine: OF_LOCALIZED(@"list_uid",
+			[OFStdOut writeString: @"\t"];
+			[OFStdOut writeLine: OF_LOCALIZED(@"list_uid",
 			    @"UID: %[uid]",
 			    @"uid", UID)];
-			[of_stdout writeString: @"\t"];
-			[of_stdout writeLine: OF_LOCALIZED(@"list_gid",
+			[OFStdOut writeString: @"\t"];
+			[OFStdOut writeLine: OF_LOCALIZED(@"list_gid",
 			    @"GID: %[gid]",
 			    @"gid", GID)];
 
 			if (entry.owner != nil) {
-				[of_stdout writeString: @"\t"];
-				[of_stdout writeLine: OF_LOCALIZED(
+				[OFStdOut writeString: @"\t"];
+				[OFStdOut writeLine: OF_LOCALIZED(
 				    @"list_owner",
 				    @"Owner: %[owner]",
 				    @"owner", entry.owner)];
 			}
 			if (entry.group != nil) {
-				[of_stdout writeString: @"\t"];
-				[of_stdout writeLine: OF_LOCALIZED(
+				[OFStdOut writeString: @"\t"];
+				[OFStdOut writeLine: OF_LOCALIZED(
 				    @"list_group",
 				    @"Group: %[group]",
 				    @"group", entry.group)];
 			}
 
-			[of_stdout writeString: @"\t"];
-			[of_stdout writeLine: OF_LOCALIZED(
+			[OFStdOut writeString: @"\t"];
+			[OFStdOut writeLine: OF_LOCALIZED(
 			    @"list_modification_date",
 			    @"Modification date: %[date]",
 			    @"date", date)];
 		}
 
 		if (app->_outputLevel >= 2) {
-			[of_stdout writeString: @"\t"];
+			[OFStdOut writeString: @"\t"];
 
 			switch (entry.type) {
 			case OFTarArchiveEntryTypeFile:
-				[of_stdout writeLine: OF_LOCALIZED(
+				[OFStdOut writeLine: OF_LOCALIZED(
 				    @"list_type_normal",
 				    @"Type: Normal file")];
 				break;
 			case OFTarArchiveEntryTypeLink:
-				[of_stdout writeLine: OF_LOCALIZED(
+				[OFStdOut writeLine: OF_LOCALIZED(
 				    @"list_type_hardlink",
 				    @"Type: Hard link")];
-				[of_stdout writeString: @"\t"];
-				[of_stdout writeLine: OF_LOCALIZED(
+				[OFStdOut writeString: @"\t"];
+				[OFStdOut writeLine: OF_LOCALIZED(
 				    @"list_link_target",
 				    @"Target file name: %[target]",
 				    @"target", entry.targetFileName)];
 				break;
 			case OFTarArchiveEntryTypeSymlink:
-				[of_stdout writeLine: OF_LOCALIZED(
+				[OFStdOut writeLine: OF_LOCALIZED(
 				    @"list_type_symlink",
 				    @"Type: Symbolic link")];
-				[of_stdout writeString: @"\t"];
-				[of_stdout writeLine: OF_LOCALIZED(
+				[OFStdOut writeString: @"\t"];
+				[OFStdOut writeLine: OF_LOCALIZED(
 				    @"list_link_target",
 				    @"Target file name: %[target]",
 				    @"target", entry.targetFileName)];
 				break;
 			case OFTarArchiveEntryTypeCharacterDevice: {
@@ -201,20 +201,20 @@
 				OFString *majorString = [OFString
 				    stringWithFormat: @"%d", entry.deviceMajor];
 				OFString *minorString = [OFString
 				    stringWithFormat: @"%d", entry.deviceMinor];
 
-				[of_stdout writeLine: OF_LOCALIZED(
+				[OFStdOut writeLine: OF_LOCALIZED(
 				    @"list_type_character_device",
 				    @"Type: Character device")];
-				[of_stdout writeString: @"\t"];
-				[of_stdout writeLine: OF_LOCALIZED(
+				[OFStdOut writeString: @"\t"];
+				[OFStdOut writeLine: OF_LOCALIZED(
 				    @"list_device_major",
 				    @"Device major: %[major]",
 				    @"major", majorString)];
-				[of_stdout writeString: @"\t"];
-				[of_stdout writeLine: OF_LOCALIZED(
+				[OFStdOut writeString: @"\t"];
+				[OFStdOut writeLine: OF_LOCALIZED(
 				    @"list_device_minor",
 				    @"Device minor: %[minor]",
 				    @"minor", minorString)];
 				break;
 			}
@@ -222,42 +222,42 @@
 				OFString *majorString = [OFString
 				    stringWithFormat: @"%d", entry.deviceMajor];
 				OFString *minorString = [OFString
 				    stringWithFormat: @"%d", entry.deviceMinor];
 
-				[of_stdout writeLine: OF_LOCALIZED(
+				[OFStdOut writeLine: OF_LOCALIZED(
 				    @"list_type_block_device",
 				    @"Type: Block device")];
-				[of_stdout writeString: @"\t"];
-				[of_stdout writeLine: OF_LOCALIZED(
+				[OFStdOut writeString: @"\t"];
+				[OFStdOut writeLine: OF_LOCALIZED(
 				    @"list_device_major",
 				    @"Device major: %[major]",
 				    @"major", majorString)];
-				[of_stdout writeString: @"\t"];
-				[of_stdout writeLine: OF_LOCALIZED(
+				[OFStdOut writeString: @"\t"];
+				[OFStdOut writeLine: OF_LOCALIZED(
 				    @"list_device_minor",
 				    @"Device minor: %[minor]",
 				    @"minor", minorString)];
 				break;
 			}
 			case OFTarArchiveEntryTypeDirectory:
-				[of_stdout writeLine: OF_LOCALIZED(
+				[OFStdOut writeLine: OF_LOCALIZED(
 				    @"list_type_directory",
 				    @"Type: Directory")];
 				break;
 			case OFTarArchiveEntryTypeFIFO:
-				[of_stdout writeLine: OF_LOCALIZED(
+				[OFStdOut writeLine: OF_LOCALIZED(
 				    @"list_type_fifo",
 				    @"Type: FIFO")];
 				break;
 			case OFTarArchiveEntryTypeContiguousFile:
-				[of_stdout writeLine: OF_LOCALIZED(
+				[OFStdOut writeLine: OF_LOCALIZED(
 				    @"list_type_contiguous_file",
 				    @"Type: Contiguous file")];
 				break;
 			default:
-				[of_stdout writeLine: OF_LOCALIZED(
+				[OFStdOut writeLine: OF_LOCALIZED(
 				    @"list_type_unknown",
 				    @"Type: Unknown")];
 				break;
 			}
 		}
@@ -288,11 +288,11 @@
 			continue;
 
 		if (type != OFTarArchiveEntryTypeFile &&
 		    type != OFTarArchiveEntryTypeDirectory) {
 			if (app->_outputLevel >= 0)
-				[of_stdout writeLine: OF_LOCALIZED(
+				[OFStdOut writeLine: OF_LOCALIZED(
 				    @"skipping_file",
 				    @"Skipping %[file]...",
 				    @"file", fileName)];
 			continue;
 		}
@@ -299,21 +299,21 @@
 
 		[missing removeObject: fileName];
 
 		outFileName = [app safeLocalPathForPath: fileName];
 		if (outFileName == nil) {
-			[of_stderr writeLine: OF_LOCALIZED(
+			[OFStdErr writeLine: OF_LOCALIZED(
 			    @"refusing_to_extract_file",
 			    @"Refusing to extract %[file]!",
 			    @"file", fileName)];
 
 			app->_exitStatus = 1;
 			goto outer_loop_end;
 		}
 
 		if (app->_outputLevel >= 0)
-			[of_stdout writeString: OF_LOCALIZED(@"extracting_file",
+			[OFStdOut writeString: OF_LOCALIZED(@"extracting_file",
 			    @"Extracting %[file]...",
 			    @"file", fileName)];
 
 		if (type == OFTarArchiveEntryTypeDirectory ||
 		    (type == OFTarArchiveEntryTypeFile &&
@@ -322,12 +322,12 @@
 					     createParents: true];
 			setPermissions(outFileName, entry);
 			setModificationDate(outFileName, entry);
 
 			if (app->_outputLevel >= 0) {
-				[of_stdout writeString: @"\r"];
-				[of_stdout writeLine: OF_LOCALIZED(
+				[OFStdOut writeString: @"\r"];
+				[OFStdOut writeLine: OF_LOCALIZED(
 				    @"extracting_file_done",
 				    @"Extracting %[file]... done",
 				    @"file", fileName)];
 			}
 
@@ -365,12 +365,12 @@
 
 				percent = newPercent;
 				percentString = [OFString stringWithFormat:
 				    @"%3u", percent];
 
-				[of_stdout writeString: @"\r"];
-				[of_stdout writeString: OF_LOCALIZED(
+				[OFStdOut writeString: @"\r"];
+				[OFStdOut writeString: OF_LOCALIZED(
 				    @"extracting_file_percent",
 				    @"Extracting %[file]... %[percent]%",
 				    @"file", fileName,
 				    @"percent", percentString)];
 			}
@@ -378,12 +378,12 @@
 
 		[output close];
 		setModificationDate(outFileName, entry);
 
 		if (app->_outputLevel >= 0) {
-			[of_stdout writeString: @"\r"];
-			[of_stdout writeLine: OF_LOCALIZED(
+			[OFStdOut writeString: @"\r"];
+			[OFStdOut writeLine: OF_LOCALIZED(
 			    @"extracting_file_done",
 			    @"Extracting %[file]... done",
 			    @"file", fileName)];
 		}
 
@@ -391,11 +391,11 @@
 		objc_autoreleasePoolPop(pool);
 	}
 
 	if (missing.count > 0) {
 		for (OFString *file in missing)
-			[of_stderr writeLine: OF_LOCALIZED(
+			[OFStdErr writeLine: OF_LOCALIZED(
 			    @"file_not_in_archive",
 			    @"File %[file] is not in the archive!",
 			    @"file", file)];
 
 		app->_exitStatus = 1;
@@ -406,11 +406,11 @@
 {
 	OFMutableSet *files;
 	OFTarArchiveEntry *entry;
 
 	if (files_.count < 1) {
-		[of_stderr writeLine: OF_LOCALIZED(@"print_no_file_specified",
+		[OFStdErr writeLine: OF_LOCALIZED(@"print_no_file_specified",
 		    @"Need one or more files to print!")];
 		app->_exitStatus = 1;
 		return;
 	}
 
@@ -425,11 +425,11 @@
 
 		stream = [_archive streamForReadingCurrentEntry];
 
 		while (!stream.atEndOfStream) {
 			ssize_t length = [app copyBlockFromStream: stream
-							 toStream: of_stdout
+							 toStream: OFStdOut
 							 fileName: fileName];
 
 			if (length < 0) {
 				app->_exitStatus = 1;
 				return;
@@ -442,11 +442,11 @@
 		if (files.count == 0)
 			break;
 	}
 
 	for (OFString *file in files) {
-		[of_stderr writeLine: OF_LOCALIZED(@"file_not_in_archive",
+		[OFStdErr writeLine: OF_LOCALIZED(@"file_not_in_archive",
 		    @"File %[file] is not in the archive!",
 		    @"file", file)];
 		app->_exitStatus = 1;
 	}
 }
@@ -454,11 +454,11 @@
 - (void)addFiles: (OFArray OF_GENERIC(OFString *) *)files
 {
 	OFFileManager *fileManager = [OFFileManager defaultManager];
 
 	if (files.count < 1) {
-		[of_stderr writeLine: OF_LOCALIZED(@"add_no_file_specified",
+		[OFStdErr writeLine: OF_LOCALIZED(@"add_no_file_specified",
 		    @"Need one or more files to add!")];
 		app->_exitStatus = 1;
 		return;
 	}
 
@@ -468,11 +468,11 @@
 		OFFileAttributeType type;
 		OFMutableTarArchiveEntry *entry;
 		OFStream *output;
 
 		if (app->_outputLevel >= 0)
-			[of_stdout writeString: OF_LOCALIZED(@"adding_file",
+			[OFStdOut writeString: OF_LOCALIZED(@"adding_file",
 			    @"Adding %[file]...",
 			    @"file", fileName)];
 
 		attributes = [fileManager attributesOfItemAtPath: fileName];
 		type = attributes.fileType;
@@ -535,23 +535,23 @@
 
 					percent = newPercent;
 					percentString = [OFString
 					    stringWithFormat: @"%3u", percent];
 
-					[of_stdout writeString: @"\r"];
-					[of_stdout writeString: OF_LOCALIZED(
+					[OFStdOut writeString: @"\r"];
+					[OFStdOut writeString: OF_LOCALIZED(
 					    @"adding_file_percent",
 					    @"Adding %[file]... %[percent]%",
 					    @"file", fileName,
 					    @"percent", percentString)];
 				}
 			}
 		}
 
 		if (app->_outputLevel >= 0) {
-			[of_stdout writeString: @"\r"];
-			[of_stdout writeLine: OF_LOCALIZED(
+			[OFStdOut writeString: @"\r"];
+			[OFStdOut writeLine: OF_LOCALIZED(
 			    @"adding_file_done",
 			    @"Adding %[file]... done",
 			    @"file", fileName)];
 		}