More code cleanup/readability improvements (from patch #2990795)
Authored by: knut_f 2010-10-09
Parent: [r1348]
Child: [r1350]
