Stop using a while loop for code that runs at most once,

Stop using a while loop for code that runs at most once,
and garbage collect an automatic variable that is no longer needed
and a comment that was probably contributed by Capt. Obvious.
No functional change.

OK millert@ martijn@