@@ -1803,19 +1803,20 @@
 	return [self rangeOfString: string
 			   options: 0
 			     range: OFMakeRange(0, self.length)];
 }
 
-- (OFRange)rangeOfString: (OFString *)string options: (int)options
+- (OFRange)rangeOfString: (OFString *)string
+		 options: (OFStringSearchOptions)options
 {
 	return [self rangeOfString: string
 			   options: options
 			     range: OFMakeRange(0, self.length)];
 }
 
 - (OFRange)rangeOfString: (OFString *)string
-		 options: (int)options
+		 options: (OFStringSearchOptions)options
 		   range: (OFRange)range
 {
 	void *pool;
 	const OFUnichar *searchCharacters;
 	OFUnichar *characters;
@@ -1836,11 +1837,11 @@
 
 	characters = of_alloc(range.length, sizeof(OFUnichar));
 	@try {
 		[self getCharacters: characters inRange: range];
 
-		if (options & OF_STRING_SEARCH_BACKWARDS) {
+		if (options & OFStringSearchBackwards) {
 			for (size_t i = range.length - searchLength;; i--) {
 				if (memcmp(characters + i, searchCharacters,
 				    searchLength * sizeof(OFUnichar)) == 0) {
 					objc_autoreleasePoolPop(pool);
 					return OFMakeRange(range.location + i,
@@ -1877,19 +1878,19 @@
 				     options: 0
 				       range: OFMakeRange(0, self.length)];
 }
 
 - (size_t)indexOfCharacterFromSet: (OFCharacterSet *)characterSet
-			  options: (int)options
+			  options: (OFStringSearchOptions)options
 {
 	return [self indexOfCharacterFromSet: characterSet
 				     options: options
 				       range: OFMakeRange(0, self.length)];
 }
 
 - (size_t)indexOfCharacterFromSet: (OFCharacterSet *)characterSet
-			  options: (int)options
+			  options: (OFStringSearchOptions)options
 			    range: (OFRange)range
 {
 	bool (*characterIsMember)(id, SEL, OFUnichar) =
 	    (bool (*)(id, SEL, OFUnichar))[characterSet
 	    methodForSelector: @selector(characterIsMember:)];
@@ -1903,11 +1904,11 @@
 
 	characters = of_alloc(range.length, sizeof(OFUnichar));
 	@try {
 		[self getCharacters: characters inRange: range];
 
-		if (options & OF_STRING_SEARCH_BACKWARDS) {
+		if (options & OFStringSearchBackwards) {
 			for (size_t i = range.length - 1;; i--) {
 				if (characterIsMember(characterSet,
 				    @selector(characterIsMember:),
 				    characters[i]))
 					return range.location + i;
@@ -2162,16 +2163,16 @@
 {
 	return [self componentsSeparatedByString: delimiter options: 0];
 }
 
 - (OFArray *)componentsSeparatedByString: (OFString *)delimiter
-				 options: (int)options
+				 options: (OFStringSeparationOptions)options
 {
 	void *pool;
 	OFMutableArray *array;
 	const OFUnichar *characters, *delimiterCharacters;
-	bool skipEmpty = (options & OF_STRING_SKIP_EMPTY);
+	bool skipEmpty = (options & OFStringSkipEmptyComponents);
 	size_t length = self.length;
 	size_t delimiterLength = delimiter.length;
 	size_t last;
 	OFString *component;
 
@@ -2228,15 +2229,15 @@
 						  options: 0];
 }
 
 - (OFArray *)
    componentsSeparatedByCharactersInSet: (OFCharacterSet *)characterSet
-				options: (int)options
+				options: (OFStringSeparationOptions)options
 {
 	OFMutableArray *array = [OFMutableArray array];
 	void *pool = objc_autoreleasePoolPush();
-	bool skipEmpty = (options & OF_STRING_SKIP_EMPTY);
+	bool skipEmpty = (options & OFStringSkipEmptyComponents);
 	const OFUnichar *characters = self.characters;
 	size_t length = self.length;
 	bool (*characterIsMember)(id, SEL, OFUnichar) =
 	    (bool (*)(id, SEL, OFUnichar))[characterSet
 	    methodForSelector: @selector(characterIsMember:)];