Cleanup code: remove int/long idioms and simplify a while statement.
5 files changed