Cosmetic changes to the code to bring consistency to the style.
Eventually, the project will include a coding standard that will
be, to the extent possible, programitically enforced.