@@ -261,18 +261,18 @@
 - mutableCopy
 {
 	return [[OFMutableArray alloc] initWithArray: self];
 }
 
-- (id)objectAtIndex: (size_t)index
+- (id)objectAtIndex: (size_t)idx
 {
 	OF_UNRECOGNIZED_SELECTOR
 }
 
-- (id)objectAtIndexedSubscript: (size_t)index
+- (id)objectAtIndexedSubscript: (size_t)idx
 {
-	return [self objectAtIndex: index];
+	return [self objectAtIndex: idx];
 }
 
 - (id)valueForKey: (OFString *)key
 {
 	id ret;
@@ -857,13 +857,13 @@
 	size_t count = [self count];
 	id *tmp = [self allocMemoryWithSize: sizeof(id)
 				      count: count];
 
 	@try {
-		[self enumerateObjectsUsingBlock: ^ (id object, size_t index,
+		[self enumerateObjectsUsingBlock: ^ (id object, size_t idx,
 		    bool *stop) {
-			tmp[index] = block(object, index);
+			tmp[idx] = block(object, idx);
 		}];
 
 		ret = [OFArray arrayWithObjects: tmp
 					  count: count];
 	} @finally {
@@ -881,13 +881,13 @@
 				      count: count];
 
 	@try {
 		__block size_t i = 0;
 
-		[self enumerateObjectsUsingBlock: ^ (id object, size_t index,
+		[self enumerateObjectsUsingBlock: ^ (id object, size_t idx,
 		    bool *stop) {
-			if (block(object, index))
+			if (block(object, idx))
 				tmp[i++] = object;
 		}];
 
 		ret = [OFArray arrayWithObjects: tmp
 					  count: i];
@@ -906,15 +906,15 @@
 	if (count == 0)
 		return nil;
 	if (count == 1)
 		return [[[self firstObject] retain] autorelease];
 
-	[self enumerateObjectsUsingBlock: ^ (id object, size_t index,
+	[self enumerateObjectsUsingBlock: ^ (id object, size_t idx,
 	    bool *stop) {
 		id new;
 
-		if (index == 0) {
+		if (idx == 0) {
 			current = [object retain];
 			return;
 		}
 
 		@try {