@@ -36,23 +36,23 @@
 + (instancetype)URL
 {
 	return [[[self alloc] init] autorelease];
 }
 
-+ (instancetype)URLWithString: (OFString*)string
++ (instancetype)URLWithString: (OFString *)string
 {
 	return [[[self alloc] initWithString: string] autorelease];
 }
 
-+ (instancetype)URLWithString: (OFString*)string
-		relativeToURL: (OFURL*)URL
++ (instancetype)URLWithString: (OFString *)string
+		relativeToURL: (OFURL *)URL
 {
 	return [[[self alloc] initWithString: string
 			       relativeToURL: URL] autorelease];
 }
 
-+ (instancetype)fileURLWithPath: (OFString*)path
++ (instancetype)fileURLWithPath: (OFString *)path
 {
 	OFURL *URL = [OFURL URL];
 	void *pool = objc_autoreleasePoolPush();
 
 	[URL setScheme: @"file"];
@@ -61,11 +61,11 @@
 	objc_autoreleasePoolPop(pool);
 
 	return URL;
 }
 
-- initWithString: (OFString*)string
+- initWithString: (OFString *)string
 {
 	char *UTF8String, *UTF8String2 = NULL;
 
 	self = [super init];
 
@@ -195,12 +195,12 @@
 	}
 
 	return self;
 }
 
-- initWithString: (OFString*)string
-   relativeToURL: (OFURL*)URL
+- initWithString: (OFString *)string
+   relativeToURL: (OFURL *)URL
 {
 	char *UTF8String, *UTF8String2 = NULL;
 
 	if ([string containsString: @"://"])
 		return [self initWithString: string];
@@ -269,11 +269,11 @@
 	}
 
 	return self;
 }
 
-- initWithSerialization: (OFXMLElement*)element
+- initWithSerialization: (OFXMLElement *)element
 {
 	@try {
 		void *pool = objc_autoreleasePoolPush();
 
 		if (![[element name] isEqual: [self className]] ||
@@ -382,11 +382,11 @@
 	}
 
 	return copy;
 }
 
-- (OFString*)string
+- (OFString *)string
 {
 	OFMutableString *ret = [OFMutableString string];
 	void *pool = objc_autoreleasePoolPush();
 
 	[ret appendFormat: @"%@://", _scheme];
@@ -433,17 +433,17 @@
 	[ret makeImmutable];
 
 	return ret;
 }
 
-- (OFString*)description
+- (OFString *)description
 {
 	return [OFString stringWithFormat: @"<%@: %@>",
 					   [self class], [self string]];
 }
 
-- (OFXMLElement*)XMLElementBySerializing
+- (OFXMLElement *)XMLElementBySerializing
 {
 	void *pool = objc_autoreleasePoolPush();
 	OFXMLElement *element;
 
 	element = [OFXMLElement elementWithName: [self className]