@@ -201,11 +201,11 @@
 	return URL;
 }
 
 - (of_file_attributes_t)attributesOfItemAtURL: (OFURL *)URL
 {
-	OF_KINDOF(OFURLHandler *) URLHandler;
+	OFURLHandler *URLHandler;
 
 	if (URL == nil)
 		@throw [OFInvalidArgumentException exception];
 
 	if ((URLHandler = [OFURLHandler handlerForURL: URL]) == nil)
@@ -229,11 +229,11 @@
 }
 
 - (void)setAttributes: (of_file_attributes_t)attributes
 	  ofItemAtURL: (OFURL *)URL
 {
-	OF_KINDOF(OFURLHandler *) URLHandler;
+	OFURLHandler *URLHandler;
 
 	if (URL == nil)
 		@throw [OFInvalidArgumentException exception];
 
 	if ((URLHandler = [OFURLHandler handlerForURL: URL]) == nil)
@@ -254,11 +254,11 @@
 	objc_autoreleasePoolPop(pool);
 }
 
 - (bool)fileExistsAtURL: (OFURL *)URL
 {
-	OF_KINDOF(OFURLHandler *) URLHandler;
+	OFURLHandler *URLHandler;
 
 	if (URL == nil)
 		@throw [OFInvalidArgumentException exception];
 
 	if ((URLHandler = [OFURLHandler handlerForURL: URL]) == nil)
@@ -279,11 +279,11 @@
 	return ret;
 }
 
 - (bool)directoryExistsAtURL: (OFURL *)URL
 {
-	OF_KINDOF(OFURLHandler *) URLHandler;
+	OFURLHandler *URLHandler;
 
 	if (URL == nil)
 		@throw [OFInvalidArgumentException exception];
 
 	if ((URLHandler = [OFURLHandler handlerForURL: URL]) == nil)
@@ -304,11 +304,11 @@
 	return ret;
 }
 
 - (void)createDirectoryAtURL: (OFURL *)URL
 {
-	OF_KINDOF(OFURLHandler *) URLHandler;
+	OFURLHandler *URLHandler;
 
 	if (URL == nil)
 		@throw [OFInvalidArgumentException exception];
 
 	if ((URLHandler = [OFURLHandler handlerForURL: URL]) == nil)
@@ -372,11 +372,11 @@
 	objc_autoreleasePoolPop(pool);
 }
 
 - (OFArray OF_GENERIC(OFString *) *)contentsOfDirectoryAtURL: (OFURL *)URL
 {
-	OF_KINDOF(OFURLHandler *) URLHandler;
+	OFURLHandler *URLHandler;
 
 	if (URL == nil)
 		@throw [OFInvalidArgumentException exception];
 
 	if ((URLHandler = [OFURLHandler handlerForURL: URL]) == nil)
@@ -472,11 +472,11 @@
 
 - (void)copyItemAtURL: (OFURL *)source
 		toURL: (OFURL *)destination
 {
 	void *pool;
-	OF_KINDOF(OFURLHandler *) URLHandler;
+	OFURLHandler *URLHandler;
 	of_file_attributes_t attributes;
 	of_file_type_t type;
 
 	if (source == nil || destination == nil)
 		@throw [OFInvalidArgumentException exception];
@@ -661,11 +661,11 @@
 
 - (void)moveItemAtURL: (OFURL *)source
 		toURL: (OFURL *)destination
 {
 	void *pool;
-	OF_KINDOF(OFURLHandler *) URLHandler;
+	OFURLHandler *URLHandler;
 
 	if (source == nil || destination == nil)
 		@throw [OFInvalidArgumentException exception];
 
 	pool = objc_autoreleasePoolPush();
@@ -713,11 +713,11 @@
 	objc_autoreleasePoolPop(pool);
 }
 
 - (void)removeItemAtURL: (OFURL *)URL
 {
-	OF_KINDOF(OFURLHandler *) URLHandler;
+	OFURLHandler *URLHandler;
 
 	if (URL == nil)
 		@throw [OFInvalidArgumentException exception];
 
 	if ((URLHandler = [OFURLHandler handlerForURL: URL]) == nil)
@@ -737,11 +737,11 @@
 
 - (void)linkItemAtURL: (OFURL *)source
 		toURL: (OFURL *)destination
 {
 	void *pool = objc_autoreleasePoolPush();
-	OF_KINDOF(OFURLHandler *) URLHandler;
+	OFURLHandler *URLHandler;
 
 	if (source == nil || destination == nil)
 		@throw [OFInvalidArgumentException exception];
 
 	if (![[destination scheme] isEqual: [source scheme]])
@@ -774,11 +774,11 @@
 
 - (void)createSymbolicLinkAtURL: (OFURL *)URL
 	    withDestinationPath: (OFString *)target
 {
 	void *pool = objc_autoreleasePoolPush();
-	OF_KINDOF(OFURLHandler *) URLHandler;
+	OFURLHandler *URLHandler;
 
 	if (URL == nil || target == nil)
 		@throw [OFInvalidArgumentException exception];
 
 	URLHandler = [OFURLHandler handlerForURL: URL];