@@ -19,88 +19,89 @@
 
 #import "OFCharacterSet.h"
 #import "OFBitSetCharacterSet.h"
 #import "OFRangeCharacterSet.h"
 
-static OFString *module = nil;
+static OFString *module;
 
 @interface SimpleCharacterSet: OFCharacterSet
 @end
 
 @implementation SimpleCharacterSet
-- (bool)characterIsMember: (of_unichar_t)character
+- (bool)characterIsMember: (OFUnichar)character
 {
 	return (character % 2 == 0);
 }
 @end
 
 @implementation TestsAppDelegate (OFCharacterSetTests)
 - (void)characterSetTests
 {
 	void *pool = objc_autoreleasePoolPush();
-	OFCharacterSet *cs, *ics;
+	OFCharacterSet *characterSet, *invertedCharacterSet;
 	bool ok;
 
 	module = @"OFCharacterSet";
 
-	cs = [[[SimpleCharacterSet alloc] init] autorelease];
+	characterSet = [[[SimpleCharacterSet alloc] init] autorelease];
 
 	ok = true;
-	for (of_unichar_t c = 0; c < 65536; c++) {
+	for (OFUnichar c = 0; c < 65536; c++) {
 		if (c % 2 == 0) {
-			if (![cs characterIsMember: c])
+			if (![characterSet characterIsMember: c])
 				ok = false;
-		} else if ([cs characterIsMember: c])
+		} else if ([characterSet characterIsMember: c])
 			ok = false;
 	}
 	TEST(@"-[characterIsMember:]", ok);
 
 	module = @"OFBitSetCharacterSet";
 
 	TEST(@"+[characterSetWithCharactersInString:]",
-	    (cs = [OFCharacterSet characterSetWithCharactersInString:
+	    (characterSet = [OFCharacterSet characterSetWithCharactersInString:
 	    @"0123456789"]) &&
-	    [cs isKindOfClass: [OFBitSetCharacterSet class]])
+	    [characterSet isKindOfClass: [OFBitSetCharacterSet class]])
 
 	ok = true;
-	for (of_unichar_t c = 0; c < 65536; c++) {
+	for (OFUnichar c = 0; c < 65536; c++) {
 		if (c >= '0' && c <= '9') {
-			if (![cs characterIsMember: c])
+			if (![characterSet characterIsMember: c])
 				ok = false;
-		} else if ([cs characterIsMember: c])
+		} else if ([characterSet characterIsMember: c])
 			ok = false;
 	}
 	TEST(@"-[characterIsMember:]", ok);
 
 	module = @"OFRangeCharacterSet";
 
 	TEST(@"+[characterSetWithRange:]",
-	    (cs = [OFCharacterSet characterSetWithRange: of_range('0', 10)]) &&
-	    [cs isKindOfClass: [OFRangeCharacterSet class]])
+	    (characterSet = [OFCharacterSet
+	    characterSetWithRange: OFRangeMake('0', 10)]) &&
+	    [characterSet isKindOfClass: [OFRangeCharacterSet class]])
 
 	ok = true;
-	for (of_unichar_t c = 0; c < 65536; c++) {
+	for (OFUnichar c = 0; c < 65536; c++) {
 		if (c >= '0' && c <= '9') {
-			if (![cs characterIsMember: c])
+			if (![characterSet characterIsMember: c])
 				ok = false;
-		} else if ([cs characterIsMember: c])
+		} else if ([characterSet characterIsMember: c])
 			ok = false;
 	}
 	TEST(@"-[characterIsMember:]", ok);
 
 	ok = true;
-	ics = cs.invertedSet;
-	for (of_unichar_t c = 0; c < 65536; c++) {
+	invertedCharacterSet = characterSet.invertedSet;
+	for (OFUnichar c = 0; c < 65536; c++) {
 		if (c >= '0' && c <= '9') {
-			if ([ics characterIsMember: c])
+			if ([invertedCharacterSet characterIsMember: c])
 				ok = false;
-		} else if (![ics characterIsMember: c])
+		} else if (![invertedCharacterSet characterIsMember: c])
 			ok = false;
 	}
 	TEST(@"-[invertedSet]", ok);
 
 	TEST(@"Inverting -[invertedSet] returns original set",
-	    ics.invertedSet == cs)
+	    invertedCharacterSet.invertedSet == characterSet)
 
 	objc_autoreleasePoolPop(pool);
 }
 @end