@@ -1683,13 +1683,13 @@
 	OFHashInit(&hash);
 
 	for (size_t i = 0; i < length; i++) {
 		const OFUnichar c = characters[i];
 
-		OFHashAdd(&hash, (c & 0xFF0000) >> 16);
-		OFHashAdd(&hash, (c & 0x00FF00) >> 8);
-		OFHashAdd(&hash, c & 0x0000FF);
+		OFHashAddByte(&hash, (c & 0xFF0000) >> 16);
+		OFHashAddByte(&hash, (c & 0x00FF00) >> 8);
+		OFHashAddByte(&hash, c & 0x0000FF);
 	}
 
 	OFHashFinalize(&hash);
 
 	return hash;
@@ -1818,19 +1818,19 @@
 
 - (OFRange)rangeOfString: (OFString *)string
 {
 	return [self rangeOfString: string
 			   options: 0
-			     range: OFRangeMake(0, self.length)];
+			     range: OFMakeRange(0, self.length)];
 }
 
 - (OFRange)rangeOfString: (OFString *)string
 		 options: (OFStringSearchOptions)options
 {
 	return [self rangeOfString: string
 			   options: options
-			     range: OFRangeMake(0, self.length)];
+			     range: OFMakeRange(0, self.length)];
 }
 
 - (OFRange)rangeOfString: (OFString *)string
 		 options: (OFStringSearchOptions)options
 		   range: (OFRange)range
@@ -1839,14 +1839,14 @@
 	const OFUnichar *searchCharacters;
 	OFUnichar *characters;
 	size_t searchLength;
 
 	if ((searchLength = string.length) == 0)
-		return OFRangeMake(0, 0);
+		return OFMakeRange(0, 0);
 
 	if (searchLength > range.length)
-		return OFRangeMake(OFNotFound, 0);
+		return OFMakeRange(OFNotFound, 0);
 
 	if (range.length > SIZE_MAX / sizeof(OFUnichar))
 		@throw [OFOutOfRangeException exception];
 
 	pool = objc_autoreleasePoolPush();
@@ -1860,11 +1860,11 @@
 		if (options & OFStringSearchBackwards) {
 			for (size_t i = range.length - searchLength;; i--) {
 				if (memcmp(characters + i, searchCharacters,
 				    searchLength * sizeof(OFUnichar)) == 0) {
 					objc_autoreleasePoolPop(pool);
-					return OFRangeMake(range.location + i,
+					return OFMakeRange(range.location + i,
 					    searchLength);
 				}
 
 				/* No match and we're at the last character */
 				if (i == 0)
@@ -1874,11 +1874,11 @@
 			for (size_t i = 0;
 			    i <= range.length - searchLength; i++) {
 				if (memcmp(characters + i, searchCharacters,
 				    searchLength * sizeof(OFUnichar)) == 0) {
 					objc_autoreleasePoolPop(pool);
-					return OFRangeMake(range.location + i,
+					return OFMakeRange(range.location + i,
 					    searchLength);
 				}
 			}
 		}
 	} @finally {
@@ -1885,26 +1885,26 @@
 		OFFreeMemory(characters);
 	}
 
 	objc_autoreleasePoolPop(pool);
 
-	return OFRangeMake(OFNotFound, 0);
+	return OFMakeRange(OFNotFound, 0);
 }
 
 - (size_t)indexOfCharacterFromSet: (OFCharacterSet *)characterSet
 {
 	return [self indexOfCharacterFromSet: characterSet
 				     options: 0
-				       range: OFRangeMake(0, self.length)];
+				       range: OFMakeRange(0, self.length)];
 }
 
 - (size_t)indexOfCharacterFromSet: (OFCharacterSet *)characterSet
 			  options: (OFStringSearchOptions)options
 {
 	return [self indexOfCharacterFromSet: characterSet
 				     options: options
-				       range: OFRangeMake(0, self.length)];
+				       range: OFMakeRange(0, self.length)];
 }
 
 - (size_t)indexOfCharacterFromSet: (OFCharacterSet *)characterSet
 			  options: (OFStringSearchOptions)options
 			    range: (OFRange)range
@@ -1979,16 +1979,16 @@
 	return false;
 }
 
 - (OFString *)substringFromIndex: (size_t)idx
 {
-	return [self substringWithRange: OFRangeMake(idx, self.length - idx)];
+	return [self substringWithRange: OFMakeRange(idx, self.length - idx)];
 }
 
 - (OFString *)substringToIndex: (size_t)idx
 {
-	return [self substringWithRange: OFRangeMake(0, idx)];
+	return [self substringWithRange: OFMakeRange(0, idx)];
 }
 
 - (OFString *)substringWithRange: (OFRange)range
 {
 	void *pool;
@@ -2130,11 +2130,11 @@
 
 	tmp = OFAllocMemory(prefixLength, sizeof(OFUnichar));
 	@try {
 		void *pool = objc_autoreleasePoolPush();
 
-		[self getCharacters: tmp inRange: OFRangeMake(0, prefixLength)];
+		[self getCharacters: tmp inRange: OFMakeRange(0, prefixLength)];
 
 		hasPrefix = (memcmp(tmp, prefix.characters,
 		    prefixLength * sizeof(OFUnichar)) == 0);
 
 		objc_autoreleasePoolPop(pool);
@@ -2160,11 +2160,11 @@
 	tmp = OFAllocMemory(suffixLength, sizeof(OFUnichar));
 	@try {
 		void *pool = objc_autoreleasePoolPush();
 
 		[self getCharacters: tmp
-			    inRange: OFRangeMake(length - suffixLength,
+			    inRange: OFMakeRange(length - suffixLength,
 					 suffixLength)];
 
 		suffixCharacters = suffix.characters;
 		hasSuffix = (memcmp(tmp, suffixCharacters,
 		    suffixLength * sizeof(OFUnichar)) == 0);
@@ -2220,18 +2220,18 @@
 		if (memcmp(characters + i, delimiterCharacters,
 		    delimiterLength * sizeof(OFUnichar)) != 0)
 			continue;
 
 		component = [self substringWithRange:
-		    OFRangeMake(last, i - last)];
+		    OFMakeRange(last, i - last)];
 		if (!skipEmpty || component.length > 0)
 			[array addObject: component];
 
 		i += delimiterLength - 1;
 		last = i + 1;
 	}
-	component = [self substringWithRange: OFRangeMake(last, length - last)];
+	component = [self substringWithRange: OFMakeRange(last, length - last)];
 	if (!skipEmpty || component.length > 0)
 		[array addObject: component];
 
 	[array makeImmutable];
 
@@ -2265,20 +2265,20 @@
 	for (size_t i = 0; i < length; i++) {
 		if (characterIsMember(characterSet,
 		    @selector(characterIsMember:), characters[i])) {
 			if (!skipEmpty || i != last) {
 				OFString *component = [self substringWithRange:
-				    OFRangeMake(last, i - last)];
+				    OFMakeRange(last, i - last)];
 				[array addObject: component];
 			}
 
 			last = i + 1;
 		}
 	}
 	if (!skipEmpty || length != last) {
 		OFString *component = [self substringWithRange:
-		    OFRangeMake(last, length - last)];
+		    OFMakeRange(last, length - last)];
 		[array addObject: component];
 	}
 
 	[array makeImmutable];
 
@@ -2548,11 +2548,11 @@
 	OFUnichar *buffer;
 	const OFUnichar *ret;
 
 	buffer = OFAllocMemory(length, sizeof(OFUnichar));
 	@try {
-		[self getCharacters: buffer inRange: OFRangeMake(0, length)];
+		[self getCharacters: buffer inRange: OFMakeRange(0, length)];
 
 		ret = [[OFData dataWithItemsNoCopy: buffer
 					     count: length
 					  itemSize: sizeof(OFUnichar)
 				      freeWhenDone: true] items];
@@ -2656,11 +2656,11 @@
 	OFChar32 *buffer;
 	const OFChar32 *ret;
 
 	buffer = OFAllocMemory(length + 1, sizeof(OFChar32));
 	@try {
-		[self getCharacters: buffer inRange: OFRangeMake(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] = OFByteSwap32(buffer[i]);
@@ -2784,22 +2784,22 @@
 
 		if (characters[i] == '\n' || characters[i] == '\r') {
 			void *pool2 = objc_autoreleasePoolPush();
 
 			block([self substringWithRange:
-			    OFRangeMake(last, i - last)], &stop);
+			    OFMakeRange(last, i - last)], &stop);
 			last = i + 1;
 
 			objc_autoreleasePoolPop(pool2);
 		}
 
 		lastCarriageReturn = (characters[i] == '\r');
 	}
 
 	if (!stop)
-		block([self substringWithRange: OFRangeMake(last, i - last)],
+		block([self substringWithRange: OFMakeRange(last, i - last)],
 		    &stop);
 
 	objc_autoreleasePoolPop(pool);
 }
 #endif
 @end