These are pure "cleanup" changes, intended to go from "reverse engineered" code to code that better reflects the intention of the original.

These are pure "cleanup" changes, intended to go from "reverse engineered" code to code that better reflects the intention of the original.