@@ -1503,11 +1503,11 @@
 {
 	OF_UNRECOGNIZED_SELECTOR
 }
 
 - (void)getCharacters: (of_unichar_t *)buffer
-	      inRange: (of_range_t)range
+	      inRange: (OFRange)range
 {
 	for (size_t i = 0; i < range.length; i++)
 		buffer[i] = [self characterAtIndex: range.location + i];
 }
 
@@ -1796,38 +1796,38 @@
 	[data addItems: self.UTF8String count: length];
 
 	return data;
 }
 
-- (of_range_t)rangeOfString: (OFString *)string
+- (OFRange)rangeOfString: (OFString *)string
 {
 	return [self rangeOfString: string
 			   options: 0
-			     range: of_range(0, self.length)];
+			     range: OFMakeRange(0, self.length)];
 }
 
-- (of_range_t)rangeOfString: (OFString *)string options: (int)options
+- (OFRange)rangeOfString: (OFString *)string options: (int)options
 {
 	return [self rangeOfString: string
 			   options: options
-			     range: of_range(0, self.length)];
+			     range: OFMakeRange(0, self.length)];
 }
 
-- (of_range_t)rangeOfString: (OFString *)string
-		    options: (int)options
-		      range: (of_range_t)range
+- (OFRange)rangeOfString: (OFString *)string
+		 options: (int)options
+		   range: (OFRange)range
 {
 	void *pool;
 	const of_unichar_t *searchCharacters;
 	of_unichar_t *characters;
 	size_t searchLength;
 
 	if ((searchLength = string.length) == 0)
-		return of_range(0, 0);
+		return OFMakeRange(0, 0);
 
 	if (searchLength > range.length)
-		return of_range(OF_NOT_FOUND, 0);
+		return OFMakeRange(OF_NOT_FOUND, 0);
 
 	if (range.length > SIZE_MAX / sizeof(of_unichar_t))
 		@throw [OFOutOfRangeException exception];
 
 	pool = objc_autoreleasePoolPush();
@@ -1841,11 +1841,11 @@
 		if (options & OF_STRING_SEARCH_BACKWARDS) {
 			for (size_t i = range.length - searchLength;; i--) {
 				if (memcmp(characters + i, searchCharacters,
 				    searchLength * sizeof(of_unichar_t)) == 0) {
 					objc_autoreleasePoolPop(pool);
-					return of_range(range.location + i,
+					return OFMakeRange(range.location + i,
 					    searchLength);
 				}
 
 				/* No match and we're at the last character */
 				if (i == 0)
@@ -1855,11 +1855,11 @@
 			for (size_t i = 0;
 			    i <= range.length - searchLength; i++) {
 				if (memcmp(characters + i, searchCharacters,
 				    searchLength * sizeof(of_unichar_t)) == 0) {
 					objc_autoreleasePoolPop(pool);
-					return of_range(range.location + i,
+					return OFMakeRange(range.location + i,
 					    searchLength);
 				}
 			}
 		}
 	} @finally {
@@ -1866,31 +1866,31 @@
 		free(characters);
 	}
 
 	objc_autoreleasePoolPop(pool);
 
-	return of_range(OF_NOT_FOUND, 0);
+	return OFMakeRange(OF_NOT_FOUND, 0);
 }
 
 - (size_t)indexOfCharacterFromSet: (OFCharacterSet *)characterSet
 {
 	return [self indexOfCharacterFromSet: characterSet
 				     options: 0
-				       range: of_range(0, self.length)];
+				       range: OFMakeRange(0, self.length)];
 }
 
 - (size_t)indexOfCharacterFromSet: (OFCharacterSet *)characterSet
 			  options: (int)options
 {
 	return [self indexOfCharacterFromSet: characterSet
 				     options: options
-				       range: of_range(0, self.length)];
+				       range: OFMakeRange(0, self.length)];
 }
 
 - (size_t)indexOfCharacterFromSet: (OFCharacterSet *)characterSet
 			  options: (int)options
-			    range: (of_range_t)range
+			    range: (OFRange)range
 {
 	bool (*characterIsMember)(id, SEL, of_unichar_t) =
 	    (bool (*)(id, SEL, of_unichar_t))[characterSet
 	    methodForSelector: @selector(characterIsMember:)];
 	of_unichar_t *characters;
@@ -1960,19 +1960,19 @@
 	return false;
 }
 
 - (OFString *)substringFromIndex: (size_t)idx
 {
-	return [self substringWithRange: of_range(idx, self.length - idx)];
+	return [self substringWithRange: OFMakeRange(idx, self.length - idx)];
 }
 
 - (OFString *)substringToIndex: (size_t)idx
 {
-	return [self substringWithRange: of_range(0, idx)];
+	return [self substringWithRange: OFMakeRange(0, idx)];
 }
 
-- (OFString *)substringWithRange: (of_range_t)range
+- (OFString *)substringWithRange: (OFRange)range
 {
 	void *pool;
 	OFString *ret;
 
 	if (range.length > SIZE_MAX - range.location ||
@@ -2039,11 +2039,11 @@
 }
 
 - (OFString *)stringByReplacingOccurrencesOfString: (OFString *)string
 					withString: (OFString *)replacement
 					   options: (int)options
-					     range: (of_range_t)range
+					     range: (OFRange)range
 {
 	OFMutableString *new = [[self mutableCopy] autorelease];
 	[new replaceOccurrencesOfString: string
 			     withString: replacement
 				options: options
@@ -2111,11 +2111,11 @@
 
 	tmp = of_alloc(prefixLength, sizeof(of_unichar_t));
 	@try {
 		void *pool = objc_autoreleasePoolPush();
 
-		[self getCharacters: tmp inRange: of_range(0, prefixLength)];
+		[self getCharacters: tmp inRange: OFMakeRange(0, prefixLength)];
 
 		hasPrefix = (memcmp(tmp, prefix.characters,
 		    prefixLength * sizeof(of_unichar_t)) == 0);
 
 		objc_autoreleasePoolPop(pool);
@@ -2141,11 +2141,11 @@
 	tmp = of_alloc(suffixLength, sizeof(of_unichar_t));
 	@try {
 		void *pool = objc_autoreleasePoolPush();
 
 		[self getCharacters: tmp
-			    inRange: of_range(length - suffixLength,
+			    inRange: OFMakeRange(length - suffixLength,
 					 suffixLength)];
 
 		suffixCharacters = suffix.characters;
 		hasSuffix = (memcmp(tmp, suffixCharacters,
 		    suffixLength * sizeof(of_unichar_t)) == 0);
@@ -2200,18 +2200,19 @@
 	for (size_t i = 0; i <= length - delimiterLength; i++) {
 		if (memcmp(characters + i, delimiterCharacters,
 		    delimiterLength * sizeof(of_unichar_t)) != 0)
 			continue;
 
-		component = [self substringWithRange: of_range(last, i - last)];
+		component = [self substringWithRange:
+		    OFMakeRange(last, i - last)];
 		if (!skipEmpty || component.length > 0)
 			[array addObject: component];
 
 		i += delimiterLength - 1;
 		last = i + 1;
 	}
-	component = [self substringWithRange: of_range(last, length - last)];
+	component = [self substringWithRange: OFMakeRange(last, length - last)];
 	if (!skipEmpty || component.length > 0)
 		[array addObject: component];
 
 	[array makeImmutable];
 
@@ -2245,20 +2246,20 @@
 	for (size_t i = 0; i < length; i++) {
 		if (characterIsMember(characterSet,
 		    @selector(characterIsMember:), characters[i])) {
 			if (!skipEmpty || i != last) {
 				OFString *component = [self substringWithRange:
-				    of_range(last, i - last)];
+				    OFMakeRange(last, i - last)];
 				[array addObject: component];
 			}
 
 			last = i + 1;
 		}
 	}
 	if (!skipEmpty || length != last) {
 		OFString *component = [self substringWithRange:
-		    of_range(last, length - last)];
+		    OFMakeRange(last, length - last)];
 		[array addObject: component];
 	}
 
 	[array makeImmutable];
 
@@ -2527,11 +2528,11 @@
 	size_t length = self.length;
 	of_unichar_t *buffer;
 
 	buffer = of_alloc(length, sizeof(of_unichar_t));
 	@try {
-		[self getCharacters: buffer inRange: of_range(0, length)];
+		[self getCharacters: buffer inRange: OFMakeRange(0, length)];
 
 		return [[OFData dataWithItemsNoCopy: buffer
 					      count: length
 					   itemSize: sizeof(of_unichar_t)
 				       freeWhenDone: true] items];
@@ -2628,11 +2629,11 @@
 	size_t length = self.length;
 	of_char32_t *buffer;
 
 	buffer = of_alloc(length + 1, sizeof(of_char32_t));
 	@try {
-		[self getCharacters: buffer inRange: of_range(0, length)];
+		[self getCharacters: buffer inRange: OFMakeRange(0, length)];
 		buffer[length] = 0;
 
 		if (byteOrder != OFByteOrderNative)
 			for (size_t i = 0; i < length; i++)
 				buffer[i] = OF_BSWAP32(buffer[i]);
@@ -2758,22 +2759,22 @@
 
 		if (characters[i] == '\n' || characters[i] == '\r') {
 			void *pool2 = objc_autoreleasePoolPush();
 
 			block([self substringWithRange:
-			    of_range(last, i - last)], &stop);
+			    OFMakeRange(last, i - last)], &stop);
 			last = i + 1;
 
 			objc_autoreleasePoolPop(pool2);
 		}
 
 		lastCarriageReturn = (characters[i] == '\r');
 	}
 
 	if (!stop)
-		block([self substringWithRange: of_range(last, i - last)],
+		block([self substringWithRange: OFMakeRange(last, i - last)],
 		    &stop);
 
 	objc_autoreleasePoolPop(pool);
 }
 #endif
 @end