@@ -226,11 +226,11 @@
 - (size_t)count
 {
 	OF_UNRECOGNIZED_SELECTOR
 }
 
-- (void)getObjects: (id *)buffer inRange: (of_range_t)range
+- (void)getObjects: (id *)buffer inRange: (OFRange)range
 {
 	for (size_t i = 0; i < range.length; i++)
 		buffer[i] = [self objectAtIndex: range.location + i];
 }
 
@@ -238,11 +238,11 @@
 {
 	size_t count = self.count;
 	id *buffer = of_alloc(count, sizeof(id));
 
 	@try {
-		[self getObjects: buffer inRange: of_range(0, count)];
+		[self getObjects: buffer inRange: OFMakeRange(0, count)];
 
 		return [[OFData dataWithItemsNoCopy: buffer
 					      count: count
 					   itemSize: sizeof(id)
 				       freeWhenDone: true] items];
@@ -361,11 +361,11 @@
 		return [self objectAtIndex: count - 1];
 
 	return nil;
 }
 
-- (OFArray *)objectsInRange: (of_range_t)range
+- (OFArray *)objectsInRange: (OFRange)range
 {
 	OFArray *ret;
 	id *buffer;
 
 	if (range.length > SIZE_MAX - range.location ||
@@ -743,11 +743,11 @@
 
 - (int)countByEnumeratingWithState: (of_fast_enumeration_state_t *)state
 			   objects: (id *)objects
 			     count: (int)count
 {
-	of_range_t range = of_range(state->state, count);
+	OFRange range = OFMakeRange(state->state, count);
 
 	if (range.length > SIZE_MAX - range.location)
 		@throw [OFOutOfRangeException exception];
 
 	if (range.location + range.length > self.count)