Integrate some code review feedback. More will follow. +1
Authored by: acucu 2011-02-09
Parent: [r1978]
Child: [r1980]