Convert two other post-decrement while-loops to pre-decrements for consistency

and for better code generation.