These loop variables had narrower type than the iteration's upper bound.

Change-Id: Iffe22c065b450b3195e3c1fbf893a24939feec20