Coding standard cleanup based upon ZappoMan's suggestions.