@@ -980,11 +980,11 @@
 
 	objc_autoreleasePoolPop(pool);
 }
 
 - (OFRange)rangeOfString: (OFString *)string
-		 options: (int)options
+		 options: (OFStringSearchOptions)options
 		   range: (OFRange)range
 {
 	const char *cString = string.UTF8String;
 	size_t cStringLength = string.UTF8StringLength;
 	size_t rangeLocation, rangeLength;
@@ -1008,11 +1008,11 @@
 		return OFMakeRange(0, 0);
 
 	if (cStringLength > rangeLength)
 		return OFMakeRange(OFNotFound, 0);
 
-	if (options & OF_STRING_SEARCH_BACKWARDS) {
+	if (options & OFStringSearchBackwards) {
 		for (size_t i = rangeLength - cStringLength;; i--) {
 			if (memcmp(_s->cString + rangeLocation + i, cString,
 			    cStringLength) == 0) {
 				range.location += of_string_utf8_get_index(
 				    _s->cString + rangeLocation, i);
@@ -1098,17 +1098,17 @@
 	return (memcmp(_s->cString + (_s->cStringLength - cStringLength),
 	    suffix.UTF8String, cStringLength) == 0);
 }
 
 - (OFArray *)componentsSeparatedByString: (OFString *)delimiter
-				 options: (int)options
+				 options: (OFStringSeparationOptions)options
 {
 	void *pool;
 	OFMutableArray *array;
 	const char *cString;
 	size_t cStringLength;
-	bool skipEmpty = (options & OF_STRING_SKIP_EMPTY);
+	bool skipEmpty = (options & OFStringSkipEmptyComponents);
 	size_t last;
 	OFString *component;
 
 	if (delimiter == nil)
 		@throw [OFInvalidArgumentException exception];