@@ -40,13 +40,12 @@
 
 void*
 objc_sparsearray_get(struct objc_sparsearray *sparsearray, uintptr_t idx)
 {
 	struct objc_sparsearray_data *iter = sparsearray->data;
-	uint8_t i;
 
-	for (i = 0; i < sparsearray->index_size - 1; i++) {
+	for (uint8_t i = 0; i < sparsearray->index_size - 1; i++) {
 		uintptr_t j =
 		    (idx >> ((sparsearray->index_size - i - 1) * 8)) & 0xFF;
 
 		if ((iter = iter->next[j]) == NULL)
 			return NULL;
@@ -58,13 +57,12 @@
 void
 objc_sparsearray_set(struct objc_sparsearray *sparsearray, uintptr_t idx,
     void *value)
 {
 	struct objc_sparsearray_data *iter = sparsearray->data;
-	uint8_t i;
 
-	for (i = 0; i < sparsearray->index_size - 1; i++) {
+	for (uint8_t i = 0; i < sparsearray->index_size - 1; i++) {
 		uintptr_t j =
 		    (idx >> ((sparsearray->index_size - i - 1) * 8)) & 0xFF;
 
 		if (iter->next[j] == NULL)
 			if ((iter->next[j] = calloc(1,
@@ -79,16 +77,14 @@
 }
 
 static void
 free_sparsearray_data(struct objc_sparsearray_data *data, uint8_t depth)
 {
-	uint16_t i;
-
 	if (data == NULL || depth == 0)
 		return;
 
-	for (i = 0; i < 256; i++)
+	for (uint_fast16_t i = 0; i < 256; i++)
 		free_sparsearray_data(data->next[i], depth - 1);
 
 	free(data);
 }