@@ -59,11 +59,11 @@
 
 		objectLength = parseObject(contents, &object, depthLimit);
 
 		count -= objectLength;
 		contents = [contents subdataWithRange:
-		    OFRangeMake(objectLength, count)];
+		    OFMakeRange(objectLength, count)];
 
 		[ret addObject: object];
 	}
 
 	[ret makeImmutable];
@@ -86,20 +86,20 @@
 		size_t objectLength;
 		OFData *objectData;
 
 		objectLength = parseObject(contents, &object, depthLimit);
 		objectData = [contents subdataWithRange:
-		    OFRangeMake(0, objectLength)];
+		    OFMakeRange(0, objectLength)];
 
 		if (previousObjectData != nil &&
 		    [objectData compare: previousObjectData] !=
 		    OFOrderedDescending)
 			@throw [OFInvalidFormatException exception];
 
 		count -= objectLength;
 		contents = [contents subdataWithRange:
-		    OFRangeMake(objectLength, count)];
+		    OFMakeRange(objectLength, count)];
 
 		[ret addObject: object];
 
 		previousObjectData = objectData;
 	}
@@ -153,11 +153,11 @@
 
 	if (count - bytesConsumed < contentsLength)
 		@throw [OFTruncatedDataException exception];
 
 	contents = [self subdataWithRange:
-	    OFRangeMake(bytesConsumed, contentsLength)];
+	    OFMakeRange(bytesConsumed, contentsLength)];
 	bytesConsumed += contentsLength;
 
 	switch (tag & ~tagConstructedMask) {
 	case OFASN1TagNumberBoolean:
 		valueClass = [OFASN1Boolean class];