Further refactorings in within day code.
Authored by: skull5 2010-10-26
Parent: [r13155]
Child: [r13157]