@@ -18,19 +18,16 @@
 #import "OFSubarray.h"
 
 #import "OFOutOfRangeException.h"
 
 @implementation OFSubarray
-+ (instancetype)arrayWithArray: (OFArray *)array
-			 range: (of_range_t)range
++ (instancetype)arrayWithArray: (OFArray *)array range: (OFRange)range
 {
-	return [[[self alloc] initWithArray: array
-				      range: range] autorelease];
+	return [[[self alloc] initWithArray: array range: range] autorelease];
 }
 
-- (instancetype)initWithArray: (OFArray *)array
-			range: (of_range_t)range
+- (instancetype)initWithArray: (OFArray *)array range: (OFRange)range
 {
 	self = [super init];
 
 	@try {
 		/* Should usually be retain, as it's useless with a copy */
@@ -62,54 +59,52 @@
 		@throw [OFOutOfRangeException exception];
 
 	return [_array objectAtIndex: idx + _range.location];
 }
 
-- (void)getObjects: (id *)buffer
-	   inRange: (of_range_t)range
+- (void)getObjects: (id *)buffer inRange: (OFRange)range
 {
 	if (range.length > SIZE_MAX - range.location ||
 	    range.location + range.length > _range.length)
 		@throw [OFOutOfRangeException exception];
 
 	range.location += _range.location;
 
-	[_array getObjects: buffer
-		   inRange: range];
+	[_array getObjects: buffer inRange: range];
 }
 
 - (size_t)indexOfObject: (id)object
 {
 	size_t idx = [_array indexOfObject: object];
 
 	if (idx < _range.location)
-		return OF_NOT_FOUND;
+		return OFNotFound;
 
 	idx -= _range.location;
 
 	if (idx >= _range.length)
-		return OF_NOT_FOUND;
+		return OFNotFound;
 
 	return idx;
 }
 
 - (size_t)indexOfObjectIdenticalTo: (id)object
 {
 	size_t idx = [_array indexOfObjectIdenticalTo: object];
 
 	if (idx < _range.location)
-		return OF_NOT_FOUND;
+		return OFNotFound;
 
 	idx -= _range.location;
 
 	if (idx >= _range.length)
-		return OF_NOT_FOUND;
+		return OFNotFound;
 
 	return idx;
 }
 
-- (OFArray *)objectsInRange: (of_range_t)range
+- (OFArray *)objectsInRange: (OFRange)range
 {
 	if (range.length > SIZE_MAX - range.location ||
 	    range.location + range.length > _range.length)
 		@throw [OFOutOfRangeException exception];