@@ -19,11 +19,11 @@
 
 #import "OFSet.h"
 #import "OFMapTableSet.h"
 #import "OFMutableMapTableSet.h"
 
-static OFString *module = nil;
+static OFString *module;
 
 @interface SimpleSet: OFSet
 {
 	OFMutableSet *_set;
 }
@@ -77,12 +77,11 @@
 	}
 
 	return self;
 }
 
-- (instancetype)initWithObject: (id)firstObject
-		     arguments: (va_list)arguments
+- (instancetype)initWithObject: (id)firstObject arguments: (va_list)arguments
 {
 	self = [super init];
 
 	@try {
 		_set = [[OFMutableSet alloc] initWithObject: firstObject
@@ -143,11 +142,11 @@
 
 	if (existed)
 		_mutations++;
 }
 
-- (int)countByEnumeratingWithState: (of_fast_enumeration_state_t *)state
+- (int)countByEnumeratingWithState: (OFFastEnumerationState *)state
 			   objects: (id *)objects
 			     count: (int)count
 {
 	int ret = [_set countByEnumeratingWithState: state
 					    objects: objects
@@ -158,12 +157,11 @@
 	return ret;
 }
 @end
 
 @implementation TestsAppDelegate (OFSetTests)
-- (void)setTestsWithClass: (Class)setClass
-	     mutableClass: (Class)mutableSetClass
+- (void)setTestsWithClass: (Class)setClass mutableClass: (Class)mutableSetClass
 {
 	void *pool = objc_autoreleasePoolPush();
 	OFSet *set1, *set2;
 	OFMutableSet *mutableSet;
 	bool ok;