@@ -36,16 +36,16 @@
 - init
 {
 	return (id)[[OFSet_hashtable alloc] init];
 }
 
-- initWithSet: (OFSet*)set
+- initWithSet: (OFSet *)set
 {
 	return (id)[[OFSet_hashtable alloc] initWithSet: set];
 }
 
-- initWithArray: (OFArray*)array
+- initWithArray: (OFArray *)array
 {
 	return (id)[[OFSet_hashtable alloc] initWithArray: array];
 }
 
 - initWithObjects: (id)firstObject, ...
@@ -59,11 +59,11 @@
 	va_end(arguments);
 
 	return ret;
 }
 
-- initWithObjects: (id const*)objects
+- initWithObjects: (id const *)objects
 	    count: (size_t)count
 {
 	return (id)[[OFSet_hashtable alloc] initWithObjects: objects
 						      count: count];
 }
@@ -73,11 +73,11 @@
 {
 	return (id)[[OFSet_hashtable alloc] initWithObject: firstObject
 						 arguments: arguments];
 }
 
-- initWithSerialization: (OFXMLElement*)element
+- initWithSerialization: (OFXMLElement *)element
 {
 	return (id)[[OFSet_hashtable alloc] initWithSerialization: element];
 }
 
 - retain
@@ -118,16 +118,16 @@
 + (instancetype)set
 {
 	return [[[self alloc] init] autorelease];
 }
 
-+ (instancetype)setWithSet: (OFSet*)set
++ (instancetype)setWithSet: (OFSet *)set
 {
 	return [[[self alloc] initWithSet: set] autorelease];
 }
 
-+ (instancetype)setWithArray: (OFArray*)array
++ (instancetype)setWithArray: (OFArray *)array
 {
 	return [[[self alloc] initWithArray: array] autorelease];
 }
 
 + (instancetype)setWithObjects: (id)firstObject, ...
@@ -141,11 +141,11 @@
 	va_end(arguments);
 
 	return ret;
 }
 
-+ (instancetype)setWithObjects: (id const*)objects
++ (instancetype)setWithObjects: (id const *)objects
 			 count: (size_t)count
 {
 	return [[[self alloc] initWithObjects: objects
 					count: count] autorelease];
 }
@@ -164,21 +164,21 @@
 	}
 
 	return [super init];
 }
 
-- initWithSet: (OFSet*)set
+- initWithSet: (OFSet *)set
 {
 	OF_INVALID_INIT_METHOD
 }
 
-- initWithArray: (OFArray*)array
+- initWithArray: (OFArray *)array
 {
 	OF_INVALID_INIT_METHOD
 }
 
-- initWithObjects: (id const*)objects
+- initWithObjects: (id const *)objects
 	    count: (size_t)count
 {
 	OF_INVALID_INIT_METHOD
 }
 
@@ -199,21 +199,21 @@
        arguments: (va_list)arguments
 {
 	OF_INVALID_INIT_METHOD
 }
 
-- initWithSerialization: (OFXMLElement*)element
+- initWithSerialization: (OFXMLElement *)element
 {
 	OF_INVALID_INIT_METHOD
 }
 
 - (size_t)count
 {
 	OF_UNRECOGNIZED_SELECTOR
 }
 
-- (id)valueForKey: (OFString*)key
+- (id)valueForKey: (OFString *)key
 {
 	OFMutableSet *ret;
 
 	if ([key hasPrefix: @"@"]) {
 		void *pool = objc_autoreleasePoolPush();
@@ -240,11 +240,11 @@
 
 	return ret;
 }
 
 - (void)setValue: (id)value
-	  forKey: (OFString*)key
+	  forKey: (OFString *)key
 {
 	if ([key hasPrefix: @"@"]) {
 		void *pool = objc_autoreleasePoolPush();
 
 		key = [key substringWithRange: of_range(1, [key length] - 1)];
@@ -266,17 +266,17 @@
 - (bool)containsObject: (id)object
 {
 	OF_UNRECOGNIZED_SELECTOR
 }
 
-- (OFEnumerator*)objectEnumerator
+- (OFEnumerator *)objectEnumerator
 {
 	OF_UNRECOGNIZED_SELECTOR
 }
 
-- (int)countByEnumeratingWithState: (of_fast_enumeration_state_t*)state
-			   objects: (id*)objects
+- (int)countByEnumeratingWithState: (of_fast_enumeration_state_t *)state
+			   objects: (id *)objects
 			     count: (int)count
 {
 	OF_UNRECOGNIZED_SELECTOR
 }
 
@@ -306,11 +306,11 @@
 	objc_autoreleasePoolPop(pool);
 
 	return hash;
 }
 
-- (OFString*)description
+- (OFString *)description
 {
 	void *pool;
 	OFMutableString *ret;
 	size_t i, count = [self count];
 
@@ -351,29 +351,29 @@
 - mutableCopy
 {
 	return [[OFMutableSet alloc] initWithSet: self];
 }
 
-- (bool)isSubsetOfSet: (OFSet*)set
+- (bool)isSubsetOfSet: (OFSet *)set
 {
 	for (id object in self)
 		if (![set containsObject: object])
 			return false;
 
 	return true;
 }
 
-- (bool)intersectsSet: (OFSet*)set
+- (bool)intersectsSet: (OFSet *)set
 {
 	for (id object in self)
 		if ([set containsObject: object])
 			return true;
 
 	return false;
 }
 
-- (OFXMLElement*)XMLElementBySerializing
+- (OFXMLElement *)XMLElementBySerializing
 {
 	void *pool = objc_autoreleasePoolPush();
 	OFXMLElement *element;
 
 	if ([self isKindOfClass: [OFMutableSet class]])
@@ -396,11 +396,11 @@
 	objc_autoreleasePoolPop(pool);
 
 	return [element autorelease];
 }
 
-- (OFSet*)setBySubtractingSet: (OFSet*)set
+- (OFSet *)setBySubtractingSet: (OFSet *)set
 {
 	OFMutableSet *new;
 
 	new = [[self mutableCopy] autorelease];
 	[new minusSet: set];
@@ -408,11 +408,11 @@
 	[new makeImmutable];
 
 	return new;
 }
 
-- (OFSet*)setByIntersectingWithSet: (OFSet*)set
+- (OFSet *)setByIntersectingWithSet: (OFSet *)set
 {
 	OFMutableSet *new;
 
 	new = [[self mutableCopy] autorelease];
 	[new intersectSet: set];
@@ -420,11 +420,11 @@
 	[new makeImmutable];
 
 	return new;
 }
 
-- (OFSet*)setByAddingSet: (OFSet*)set
+- (OFSet *)setByAddingSet: (OFSet *)set
 {
 	OFMutableSet *new;
 
 	new = [[self mutableCopy] autorelease];
 	[new unionSet: set];
@@ -432,11 +432,11 @@
 	[new makeImmutable];
 
 	return new;
 }
 
-- (OFArray*)allObjects
+- (OFArray *)allObjects
 {
 	void *pool = objc_autoreleasePoolPush();
 	OFArray *ret = [[[self objectEnumerator] allObjects] retain];
 	objc_autoreleasePoolPop(pool);
 
@@ -463,11 +463,11 @@
 		if (stop)
 			break;
 	}
 }
 
-- (OFSet*)filteredSetUsingBlock: (of_set_filter_block_t)block
+- (OFSet *)filteredSetUsingBlock: (of_set_filter_block_t)block
 {
 	OFMutableSet *ret = [OFMutableSet set];
 
 	[self enumerateObjectsUsingBlock: ^ (id object, bool *stop) {
 		if (block(object))