Revert "Add still more minor cosmetic fixes."

This reverts commit 6d62ab1b7cf0fbf6dda50f86f27822a9551da8ae.

Created by  Steven Noonan  on October 25, 2009
2J7K5MBUMH2E7SP6QAG3NCWLKOAVCCXGBTOWBS4TFR62EPR5LCTQC
Change contents