@@ -197,11 +197,11 @@
 				    substringFromIndex: pos + 1] copy];
 			else
 				pos = argument.length;
 
 			_lastLongOption = [[argument substringWithRange:
-			    OFRangeMake(2, pos - 2)] copy];
+			    OFMakeRange(2, pos - 2)] copy];
 
 			objc_autoreleasePoolPop(pool);
 
 			option = [_longOptions objectForKey: _lastLongOption];
 			if (option == NULL)
@@ -269,8 +269,8 @@
 }
 
 - (OFArray *)remainingArguments
 {
 	return [_arguments objectsInRange:
-	    OFRangeMake(_index, _arguments.count - _index)];
+	    OFMakeRange(_index, _arguments.count - _index)];
 }
 @end