Object: Turn a couple of degenerate for loops into while loops.

No functionality change.