Incorporate partial code review feedback (mostly cosmetic changes).
Authored by: bringrags 2010-10-04
Parent: [r64]
Child: [r66]