Fix icc warnings. This couldn't have been correct since i is checked

for 2 different values without changing.  I think this was the intent.
The unused warning only occurs when not building in debug mode.