@@ -181,11 +181,11 @@
 - (OFURL *)currentDirectoryURL
 {
 	void *pool = objc_autoreleasePoolPush();
 	OFURL *ret;
 
-	ret = [OFURL fileURLWithPath: [self currentDirectoryPath]];
+	ret = [OFURL fileURLWithPath: self.currentDirectoryPath];
 
 	[ret retain];
 	objc_autoreleasePoolPop(pool);
 	return [ret autorelease];
 }
@@ -342,22 +342,22 @@
 		 */
 		if ([e errNo] != ENOENT)
 			@throw e;
 	}
 
-	components = [[URL URLEncodedPath] componentsSeparatedByString: @"/"];
+	components = [URL.URLEncodedPath componentsSeparatedByString: @"/"];
 
 	for (OFString *component in components) {
 		if (currentPath != nil)
 			currentPath = [currentPath
 			    stringByAppendingFormat: @"/%@", component];
 		else
 			currentPath = component;
 
-		[URL setURLEncodedPath: currentPath];
+		URL.URLEncodedPath = currentPath;
 
-		if ([currentPath length] > 0 &&
+		if (currentPath.length > 0 &&
 		    ![self directoryExistsAtURL: URL])
 			[self createDirectoryAtURL: URL];
 	}
 
 	objc_autoreleasePoolPop(pool);
@@ -414,11 +414,11 @@
 {
 	if (path == nil)
 		@throw [OFInvalidArgumentException exception];
 
 #if defined(OF_WINDOWS)
-	if (_wchdir([path UTF16String]) != 0)
+	if (_wchdir(path.UTF16String) != 0)
 		@throw [OFChangeCurrentDirectoryPathFailedException
 		    exceptionWithPath: path
 				errNo: errno];
 #elif defined(OF_AMIGAOS)
 	BPTR lock, oldLock;
@@ -463,11 +463,11 @@
 
 - (void)changeCurrentDirectoryURL: (OFURL *)URL
 {
 	void *pool = objc_autoreleasePoolPush();
 
-	[self changeCurrentDirectoryPath: [URL fileSystemRepresentation]];
+	[self changeCurrentDirectoryPath: URL.fileSystemRepresentation];
 
 	objc_autoreleasePoolPop(pool);
 }
 
 - (void)copyItemAtPath: (OFString *)source
@@ -512,14 +512,14 @@
 		attributes = [self attributesOfItemAtURL: source];
 	} @catch (OFRetrieveItemAttributesFailedException *e) {
 		@throw [OFCopyItemFailedException
 		    exceptionWithSourceURL: source
 			    destinationURL: destination
-				     errNo: [e errNo]];
+				     errNo: e.errNo];
 	}
 
-	type = [attributes fileType];
+	type = attributes.fileType;
 
 	if ([type isEqual: of_file_type_directory]) {
 		OFArray *contents;
 
 		@try {
@@ -584,11 +584,11 @@
 				     mode: @"r"];
 			destinationStream = [[OFURLHandler handlerForURL:
 			    destination] openItemAtURL: destination
 						  mode: @"w"];
 
-			while (![sourceStream isAtEndOfStream]) {
+			while (!sourceStream.atEndOfStream) {
 				size_t length;
 
 				length = [sourceStream
 				    readIntoBuffer: buffer
 					    length: pageSize];
@@ -628,11 +628,11 @@
 		}
 #ifdef OF_FILE_MANAGER_SUPPORTS_SYMLINKS
 	} else if ([type isEqual: of_file_type_symbolic_link]) {
 		@try {
 			OFString *linkDestination =
-			    [attributes fileSymbolicLinkDestination];
+			    attributes.fileSymbolicLinkDestination;
 
 			[self createSymbolicLinkAtURL: destination
 				  withDestinationPath: linkDestination];
 		} @catch (id e) {
 			/*
@@ -688,11 +688,11 @@
 	@try {
 		if ([URLHandler moveItemAtURL: source
 					toURL: destination])
 			return;
 	} @catch (OFMoveItemFailedException *e) {
-		if ([e errNo] != EXDEV)
+		if (e.errNo != EXDEV)
 			@throw e;
 	}
 
 	if ([self fileExistsAtURL: destination])
 		@throw [OFMoveItemFailedException
@@ -707,20 +707,20 @@
 		[self removeItemAtURL: destination];
 
 		@throw [OFMoveItemFailedException
 		    exceptionWithSourceURL: source
 			    destinationURL: destination
-				     errNo: [e errNo]];
+				     errNo: e.errNo];
 	}
 
 	@try {
 		[self removeItemAtURL: source];
 	} @catch (OFRemoveItemFailedException *e) {
 		@throw [OFMoveItemFailedException
 		    exceptionWithSourceURL: source
 			    destinationURL: destination
-				     errNo: [e errNo]];
+				     errNo: e.errNo];
 	}
 
 	objc_autoreleasePoolPop(pool);
 }
 
@@ -753,11 +753,11 @@
 	OFURLHandler *URLHandler;
 
 	if (source == nil || destination == nil)
 		@throw [OFInvalidArgumentException exception];
 
-	if (![[destination scheme] isEqual: [source scheme]])
+	if (![destination.scheme isEqual: source.scheme])
 		@throw [OFInvalidArgumentException exception];
 
 	URLHandler = [OFURLHandler handlerForURL: source];
 
 	if (URLHandler == nil)