Compiler suggested cleanups
HP2100: Current version from Dave Bryan