@@ -240,11 +240,11 @@
 	size_t count = self.count;
 	id *buffer = OFAllocMemory(count, sizeof(id));
 	id const *ret;
 
 	@try {
-		[self getObjects: buffer inRange: OFRangeMake(0, count)];
+		[self getObjects: buffer inRange: OFMakeRange(0, count)];
 
 		ret = [[OFData dataWithItemsNoCopy: buffer
 					     count: count
 					  itemSize: sizeof(id)
 				      freeWhenDone: true] items];
@@ -533,11 +533,11 @@
 
 	pool = objc_autoreleasePoolPush();
 	ret = [[self componentsJoinedByString: @",\n"] mutableCopy];
 
 	@try {
-		[ret prependString: @"(\n"];
+		[ret insertString: @"(\n" atIndex: 0];
 		[ret replaceOccurrencesOfString: @"\n" withString: @"\n\t"];
 		[ret appendString: @"\n)"];
 	} @catch (id e) {
 		[ret release];
 		@throw e;
@@ -749,11 +749,11 @@
 
 - (int)countByEnumeratingWithState: (OFFastEnumerationState *)state
 			   objects: (id *)objects
 			     count: (int)count
 {
-	OFRange range = OFRangeMake(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)