CODE: Some slight cleanup and alignment of for loop count types with that which is being counted.