@@ -68,12 +68,11 @@
 	EXPECT_EXCEPTION(@"+[URLWithString:] fails with invalid characters #8",
 	    OFInvalidFormatException,
 	    [OFURL URLWithString: @"https://[f]:f/"])
 
 	TEST(@"+[URLWithString:relativeToURL:]",
-	    [[[OFURL URLWithString: @"/foo"
-		     relativeToURL: u1] string] isEqual:
+	    [[[OFURL URLWithString: @"/foo" relativeToURL: u1] string] isEqual:
 	    @"ht%3atp://us%3Aer:p%40w@ho%3Ast:1234/foo"] &&
 	    [[[OFURL URLWithString: @"foo/bar?q"
 		     relativeToURL: [OFURL URLWithString: @"http://h/qux/quux"]]
 	    string] isEqual: @"http://h/qux/foo/bar?q"] &&
 	    [[[OFURL URLWithString: @"foo/bar"
@@ -89,30 +88,26 @@
 	    string] isEqual: @"http://foo/foo"])
 
 	EXPECT_EXCEPTION(
 	    @"+[URLWithString:relativeToURL:] fails with invalid characters #1",
 	    OFInvalidFormatException,
-	    [OFURL URLWithString: @"`"
-		   relativeToURL: u1])
+	    [OFURL URLWithString: @"`" relativeToURL: u1])
 
 	EXPECT_EXCEPTION(
 	    @"+[URLWithString:relativeToURL:] fails with invalid characters #2",
 	    OFInvalidFormatException,
-	    [OFURL URLWithString: @"/`"
-		   relativeToURL: u1])
+	    [OFURL URLWithString: @"/`" relativeToURL: u1])
 
 	EXPECT_EXCEPTION(
 	    @"+[URLWithString:relativeToURL:] fails with invalid characters #3",
 	    OFInvalidFormatException,
-	    [OFURL URLWithString: @"?`"
-		   relativeToURL: u1])
+	    [OFURL URLWithString: @"?`" relativeToURL: u1])
 
 	EXPECT_EXCEPTION(
 	    @"+[URLWithString:relativeToURL:] fails with invalid characters #4",
 	    OFInvalidFormatException,
-	    [OFURL URLWithString: @"#`"
-		   relativeToURL: u1])
+	    [OFURL URLWithString: @"#`" relativeToURL: u1])
 
 #ifdef OF_HAVE_FILES
 	TEST(@"+[fileURLWithPath:]",
 	    [[[OFURL fileURLWithPath: @"testfile.txt"] fileSystemRepresentation]
 	    isEqual: [[OFFileManager defaultManager].currentDirectoryPath
@@ -289,24 +284,20 @@
 	    @"-[setURLEncodedFragment:] with invalid characters fails",
 	    OFInvalidFormatException, mu.URLEncodedFragment = @"`")
 
 	TEST(@"-[URLByAppendingPathComponent:isDirectory:]",
 	    [[[OFURL URLWithString: @"file:///foo/bar"]
-	    URLByAppendingPathComponent: @"qux"
-			    isDirectory: false] isEqual:
+	    URLByAppendingPathComponent: @"qux" isDirectory: false] isEqual:
 	    [OFURL URLWithString: @"file:///foo/bar/qux"]] &&
 	    [[[OFURL URLWithString: @"file:///foo/bar/"]
-	    URLByAppendingPathComponent: @"qux"
-			    isDirectory: false] isEqual:
+	    URLByAppendingPathComponent: @"qux" isDirectory: false] isEqual:
 	    [OFURL URLWithString: @"file:///foo/bar/qux"]] &&
 	    [[[OFURL URLWithString: @"file:///foo/bar/"]
-	    URLByAppendingPathComponent: @"qu?x"
-			    isDirectory: false] isEqual:
+	    URLByAppendingPathComponent: @"qu?x" isDirectory: false] isEqual:
 	    [OFURL URLWithString: @"file:///foo/bar/qu%3Fx"]] &&
 	    [[[OFURL URLWithString: @"file:///foo/bar/"]
-	    URLByAppendingPathComponent: @"qu?x"
-			    isDirectory: true] isEqual:
+	    URLByAppendingPathComponent: @"qu?x" isDirectory: true] isEqual:
 	    [OFURL URLWithString: @"file:///foo/bar/qu%3Fx/"]])
 
 	TEST(@"-[URLByStandardizingPath]",
 	    [[[OFURL URLWithString: @"http://foo/bar/.."]
 	    URLByStandardizingPath] isEqual: