Index: utils/ofarc/Archive.h
==================================================================
--- utils/ofarc/Archive.h
+++ utils/ofarc/Archive.h
@@ -14,19 +14,25 @@
  */
 
 #import "OFObject.h"
 #import "OFFile.h"
 #import "OFArray.h"
+
+OF_ASSUME_NONNULL_BEGIN
 
 @protocol Archive <OFObject>
-+ (instancetype)archiveWithStream: (OF_KINDOF(OFStream *))stream
-			     mode: (OFString *)mode
-			 encoding: (OFStringEncoding)encoding;
-- (instancetype)initWithStream: (OF_KINDOF(OFStream *))stream
-			  mode: (OFString *)mode
-		      encoding: (OFStringEncoding)encoding;
++ (instancetype)archiveWithPath: (OFString *)path
+			 stream: (OF_KINDOF(OFStream *))stream
+			   mode: (OFString *)mode
+		       encoding: (OFStringEncoding)encoding;
+- (instancetype)initWithPath: (OFString *)path
+		      stream: (OF_KINDOF(OFStream *))stream
+			mode: (OFString *)mode
+		    encoding: (OFStringEncoding)encoding;
 - (void)listFiles;
 - (void)extractFiles: (OFArray OF_GENERIC(OFString *) *)files;
 - (void)printFiles: (OFArray OF_GENERIC(OFString *) *)files;
 @optional
 - (void)addFiles: (OFArray OF_GENERIC(OFString *) *)files;
 @end
+
+OF_ASSUME_NONNULL_END

Index: utils/ofarc/GZIPArchive.m
==================================================================
--- utils/ofarc/GZIPArchive.m
+++ utils/ofarc/GZIPArchive.m
@@ -63,22 +63,25 @@
 {
 	if (self == [GZIPArchive class])
 		app = (OFArc *)[OFApplication sharedApplication].delegate;
 }
 
-+ (instancetype)archiveWithStream: (OF_KINDOF(OFStream *))stream
-			     mode: (OFString *)mode
-			 encoding: (OFStringEncoding)encoding
-{
-	return [[[self alloc] initWithStream: stream
-					mode: mode
-				    encoding: encoding] autorelease];
-}
-
-- (instancetype)initWithStream: (OF_KINDOF(OFStream *))stream
-			  mode: (OFString *)mode
-		      encoding: (OFStringEncoding)encoding
++ (instancetype)archiveWithPath: (OFString *)path
+			 stream: (OF_KINDOF(OFStream *))stream
+			   mode: (OFString *)mode
+		       encoding: (OFStringEncoding)encoding
+{
+	return [[[self alloc] initWithPath: path
+				    stream: stream
+				      mode: mode
+				  encoding: encoding] autorelease];
+}
+
+- (instancetype)initWithPath: (OFString *)path
+		      stream: (OF_KINDOF(OFStream *))stream
+			mode: (OFString *)mode
+		    encoding: (OFStringEncoding)encoding
 {
 	self = [super init];
 
 	@try {
 		_stream = [[OFGZIPStream alloc] initWithStream: stream

Index: utils/ofarc/LHAArchive.m
==================================================================
--- utils/ofarc/LHAArchive.m
+++ utils/ofarc/LHAArchive.m
@@ -81,22 +81,25 @@
 {
 	if (self == [LHAArchive class])
 		app = (OFArc *)[OFApplication sharedApplication].delegate;
 }
 
-+ (instancetype)archiveWithStream: (OF_KINDOF(OFStream *))stream
-			     mode: (OFString *)mode
-			 encoding: (OFStringEncoding)encoding
++ (instancetype)archiveWithPath: (OFString *)path
+			 stream: (OF_KINDOF(OFStream *))stream
+			   mode: (OFString *)mode
+		       encoding: (OFStringEncoding)encoding
 {
-	return [[[self alloc] initWithStream: stream
-					mode: mode
-				    encoding: encoding] autorelease];
+	return [[[self alloc] initWithPath: path
+				    stream: stream
+				      mode: mode
+				  encoding: encoding] autorelease];
 }
 
-- (instancetype)initWithStream: (OF_KINDOF(OFStream *))stream
-			  mode: (OFString *)mode
-		      encoding: (OFStringEncoding)encoding
+- (instancetype)initWithPath: (OFString *)path
+		      stream: (OF_KINDOF(OFStream *))stream
+			mode: (OFString *)mode
+		    encoding: (OFStringEncoding)encoding
 {
 	self = [super init];
 
 	@try {
 		_archive = [[OFLHAArchive alloc] initWithStream: stream

Index: utils/ofarc/OFArc.m
==================================================================
--- utils/ofarc/OFArc.m
+++ utils/ofarc/OFArc.m
@@ -532,10 +532,12 @@
 			file = OFStdIn;
 			break;
 		default:
 			@throw [OFInvalidArgumentException exception];
 		}
+
+		path = nil;
 	} else {
 		@try {
 			file = [OFFile fileWithPath: path mode: fileModeString];
 		} @catch (OFOpenItemFailedException *e) {
 			OFString *error = [OFString
@@ -566,32 +568,37 @@
 			type = @"zip";
 	}
 
 	@try {
 		if ([type isEqual: @"gz"])
-			archive = [GZIPArchive archiveWithStream: file
-							    mode: modeString
-							encoding: encoding];
+			archive = [GZIPArchive archiveWithPath: path
+							stream: file
+							  mode: modeString
+						      encoding: encoding];
 		else if ([type isEqual: @"lha"])
-			archive = [LHAArchive archiveWithStream: file
-							   mode: modeString
-						       encoding: encoding];
+			 archive = [LHAArchive archiveWithPath: path
+							stream: file
+							  mode: modeString
+						      encoding: encoding];
 		else if ([type isEqual: @"tar"])
-			archive = [TarArchive archiveWithStream: file
-							   mode: modeString
-						       encoding: encoding];
+			archive = [TarArchive archiveWithPath: path
+						       stream: file
+							 mode: modeString
+						     encoding: encoding];
 		else if ([type isEqual: @"tgz"]) {
 			OFStream *GZIPStream = [OFGZIPStream
 			    streamWithStream: file
 					mode: modeString];
-			archive = [TarArchive archiveWithStream: GZIPStream
-							   mode: modeString
-						       encoding: encoding];
+			archive = [TarArchive archiveWithPath: path
+						       stream: GZIPStream
+							 mode: modeString
+						     encoding: encoding];
 		} else if ([type isEqual: @"zip"])
-			archive = [ZIPArchive archiveWithStream: file
-							   mode: modeString
-						       encoding: encoding];
+			archive = [ZIPArchive archiveWithPath: path
+						       stream: file
+							 mode: modeString
+						     encoding: encoding];
 		else {
 			[OFStdErr writeLine: OF_LOCALIZED(
 			    @"unknown_archive_type",
 			    @"Unknown archive type: %[type]",
 			    @"type", type)];

Index: utils/ofarc/TarArchive.m
==================================================================
--- utils/ofarc/TarArchive.m
+++ utils/ofarc/TarArchive.m
@@ -74,22 +74,25 @@
 {
 	if (self == [TarArchive class])
 		app = (OFArc *)[OFApplication sharedApplication].delegate;
 }
 
-+ (instancetype)archiveWithStream: (OF_KINDOF(OFStream *))stream
-			     mode: (OFString *)mode
-			 encoding: (OFStringEncoding)encoding
++ (instancetype)archiveWithPath: (OFString *)path
+			 stream: (OF_KINDOF(OFStream *))stream
+			   mode: (OFString *)mode
+		       encoding: (OFStringEncoding)encoding
 {
-	return [[[self alloc] initWithStream: stream
-					mode: mode
-				    encoding: encoding] autorelease];
+	return [[[self alloc] initWithPath: path
+				    stream: stream
+				      mode: mode
+				  encoding: encoding] autorelease];
 }
 
-- (instancetype)initWithStream: (OF_KINDOF(OFStream *))stream
-			  mode: (OFString *)mode
-		      encoding: (OFStringEncoding)encoding
+- (instancetype)initWithPath: (OFString *)path
+		      stream: (OF_KINDOF(OFStream *))stream
+			mode: (OFString *)mode
+		    encoding: (OFStringEncoding)encoding
 {
 	self = [super init];
 
 	@try {
 		_archive = [[OFTarArchive alloc] initWithStream: stream

Index: utils/ofarc/ZIPArchive.m
==================================================================
--- utils/ofarc/ZIPArchive.m
+++ utils/ofarc/ZIPArchive.m
@@ -81,22 +81,25 @@
 {
 	if (self == [ZIPArchive class])
 		app = (OFArc *)[OFApplication sharedApplication].delegate;
 }
 
-+ (instancetype)archiveWithStream: (OF_KINDOF(OFStream *))stream
-			     mode: (OFString *)mode
-			 encoding: (OFStringEncoding)encoding
++ (instancetype)archiveWithPath: (OFString *)path
+			 stream: (OF_KINDOF(OFStream *))stream
+			   mode: (OFString *)mode
+		       encoding: (OFStringEncoding)encoding
 {
-	return [[[self alloc] initWithStream: stream
-					mode: mode
-				    encoding: encoding] autorelease];
+	return [[[self alloc] initWithPath: path
+				    stream: stream
+				      mode: mode
+				  encoding: encoding] autorelease];
 }
 
-- (instancetype)initWithStream: (OF_KINDOF(OFStream *))stream
-			  mode: (OFString *)mode
-		      encoding: (OFStringEncoding)encoding
+- (instancetype)initWithPath: (OFString *)path
+		      stream: (OF_KINDOF(OFStream *))stream
+			mode: (OFString *)mode
+		    encoding: (OFStringEncoding)encoding
 {
 	self = [super init];
 
 	@try {
 		_archive = [[OFZIPArchive alloc] initWithStream: stream