@@ -242,18 +242,18 @@
 }
 
 - (void)replaceObject: (id)oldObject
 	   withObject: (id)newObject
 {
-	size_t i, count;
+	size_t count;
 
 	if (oldObject == nil || newObject == nil)
 		@throw [OFInvalidArgumentException exception];
 
 	count = [self count];
 
-	for (i = 0; i < count; i++) {
+	for (size_t i = 0; i < count; i++) {
 		if ([[self objectAtIndex: i] isEqual: oldObject]) {
 			[self replaceObjectAtIndex: i
 					withObject: newObject];
 			return;
 		}
@@ -261,18 +261,18 @@
 }
 
 - (void)replaceObjectIdenticalTo: (id)oldObject
 		      withObject: (id)newObject
 {
-	size_t i, count;
+	size_t count;
 
 	if (oldObject == nil || newObject == nil)
 		@throw [OFInvalidArgumentException exception];
 
 	count = [self count];
 
-	for (i = 0; i < count; i++) {
+	for (size_t i = 0; i < count; i++) {
 		if ([self objectAtIndex: i] == oldObject) {
 			[self replaceObjectAtIndex: i
 					withObject: newObject];
 
 			return;
@@ -285,18 +285,18 @@
 	OF_UNRECOGNIZED_SELECTOR
 }
 
 - (void)removeObject: (id)object
 {
-	size_t i, count;
+	size_t count;
 
 	if (object == nil)
 		@throw [OFInvalidArgumentException exception];
 
 	count = [self count];
 
-	for (i = 0; i < count; i++) {
+	for (size_t i = 0; i < count; i++) {
 		if ([[self objectAtIndex: i] isEqual: object]) {
 			[self removeObjectAtIndex: i];
 
 			return;
 		}
@@ -303,18 +303,18 @@
 	}
 }
 
 - (void)removeObjectIdenticalTo: (id)object
 {
-	size_t i, count;
+	size_t count;
 
 	if (object == nil)
 		@throw [OFInvalidArgumentException exception];
 
 	count = [self count];
 
-	for (i = 0; i < count; i++) {
+	for (size_t i = 0; i < count; i++) {
 		if ([self objectAtIndex: i] == object) {
 			[self removeObjectAtIndex: i];
 
 			return;
 		}
@@ -321,13 +321,11 @@
 	}
 }
 
 - (void)removeObjectsInRange: (of_range_t)range
 {
-	size_t i;
-
-	for (i = 0; i < range.length; i++)
+	for (size_t i = 0; i < range.length; i++)
 		[self removeObjectAtIndex: range.location];
 }
 
 - (void)removeLastObject
 {