@@ -180,13 +180,11 @@
 	return self;
 }
 
 - (void)dealloc
 {
-	uint32_t i;
-
-	for (i = 0; i < _capacity; i++) {
+	for (uint32_t i = 0; i < _capacity; i++) {
 		if (_buckets[i] != NULL && _buckets[i] != &deleted) {
 			_keyFunctions.release(_buckets[i]->key);
 			_valueFunctions.release(_buckets[i]->value);
 		}
 	}
@@ -195,11 +193,10 @@
 }
 
 - (bool)isEqual: (id)object
 {
 	OFMapTable *mapTable;
-	uint32_t i;
 
 	if (![object isKindOfClass: [OFMapTable class]])
 		return false;
 
 	mapTable = object;
@@ -207,11 +204,11 @@
 	if (mapTable->_count != _count ||
 	    mapTable->_keyFunctions.equal != _keyFunctions.equal ||
 	    mapTable->_valueFunctions.equal != _valueFunctions.equal)
 		return false;
 
-	for (i = 0; i < _capacity; i++) {
+	for (uint32_t i = 0; i < _capacity; i++) {
 		if (_buckets[i] != NULL && _buckets[i] != &deleted) {
 			void *value = [mapTable valueForKey: _buckets[i]->key];
 
 			if (!_valueFunctions.equal(value, _buckets[i]->value))
 				return false;
@@ -221,13 +218,13 @@
 	return true;
 }
 
 - (uint32_t)hash
 {
-	uint32_t i, hash = 0;
+	uint32_t hash = 0;
 
-	for (i = 0; i < _capacity; i++) {
+	for (uint32_t i = 0; i < _capacity; i++) {
 		if (_buckets[i] != NULL && _buckets[i] != &deleted) {
 			hash += OF_ROR(_buckets[i]->hash, _rotate);
 			hash += _valueFunctions.hash(_buckets[i]->value);
 		}
 	}
@@ -241,13 +238,11 @@
 	    initWithKeyFunctions: _keyFunctions
 		  valueFunctions: _valueFunctions
 			capacity: _capacity];
 
 	@try {
-		uint32_t i;
-
-		for (i = 0; i < _capacity; i++)
+		for (uint32_t i = 0; i < _capacity; i++)
 			if (_buckets[i] != NULL && _buckets[i] != &deleted)
 				[copy OF_setValue: _buckets[i]->value
 					   forKey: _buckets[i]->key
 					     hash: OF_ROR(_buckets[i]->hash,
 						       _rotate)];
@@ -299,11 +294,11 @@
 	return NULL;
 }
 
 - (void)OF_resizeForCount: (uint32_t)count
 {
-	uint32_t i, fullness, capacity;
+	uint32_t fullness, capacity;
 	struct of_map_table_bucket **buckets;
 
 	if (count > UINT32_MAX / sizeof(*_buckets) || count > UINT32_MAX / 8)
 		@throw [OFOutOfRangeException exception];
 
@@ -329,11 +324,11 @@
 	buckets = [self allocMemoryWithSize: sizeof(*buckets)
 				      count: capacity];
 
 	memset(buckets, 0, capacity * sizeof(*buckets));
 
-	for (i = 0; i < _capacity; i++) {
+	for (uint32_t i = 0; i < _capacity; i++) {
 		if (_buckets[i] != NULL && _buckets[i] != &deleted) {
 			uint32_t j, last;
 
 			last = capacity;
 
@@ -512,13 +507,11 @@
 	}
 }
 
 - (void)removeAllValues
 {
-	uint32_t i;
-
-	for (i = 0; i < _capacity; i++) {
+	for (uint32_t i = 0; i < _capacity; i++) {
 		if (_buckets[i] != NULL) {
 			if (_buckets[i] == &deleted) {
 				_buckets[i] = NULL;
 				continue;
 			}
@@ -551,31 +544,27 @@
 #endif
 }
 
 - (bool)containsValue: (void*)value
 {
-	uint32_t i;
-
 	if (value == NULL || _count == 0)
 		return false;
 
-	for (i = 0; i < _capacity; i++)
+	for (uint32_t i = 0; i < _capacity; i++)
 		if (_buckets[i] != NULL && _buckets[i] != &deleted)
 			if (_valueFunctions.equal(_buckets[i]->value, value))
 				return true;
 
 	return false;
 }
 
 - (bool)containsValueIdenticalTo: (void*)value
 {
-	uint32_t i;
-
 	if (value == NULL || _count == 0)
 		return false;
 
-	for (i = 0; i < _capacity; i++)
+	for (uint32_t i = 0; i < _capacity; i++)
 		if (_buckets[i] != NULL && _buckets[i] != &deleted)
 			if (_buckets[i]->value == value)
 				return true;
 
 	return false;
@@ -626,15 +615,14 @@
 
 #ifdef OF_HAVE_BLOCKS
 - (void)enumerateKeysAndValuesUsingBlock:
     (of_map_table_enumeration_block_t)block
 {
-	size_t i;
 	bool stop = false;
 	unsigned long mutations = _mutations;
 
-	for (i = 0; i < _capacity && !stop; i++) {
+	for (size_t i = 0; i < _capacity && !stop; i++) {
 		if (_mutations != mutations)
 			@throw [OFEnumerationMutationException
 			    exceptionWithObject: self];
 
 		if (_buckets[i] != NULL && _buckets[i] != &deleted)
@@ -642,14 +630,13 @@
 	}
 }
 
 - (void)replaceValuesUsingBlock: (of_map_table_replace_block_t)block
 {
-	size_t i;
 	unsigned long mutations = _mutations;
 
-	for (i = 0; i < _capacity; i++) {
+	for (size_t i = 0; i < _capacity; i++) {
 		if (_mutations != mutations)
 			@throw [OFEnumerationMutationException
 			    exceptionWithObject: self];
 
 		if (_buckets[i] != NULL && _buckets[i] != &deleted) {