Minor Refactorings across the Board
Authored by: auhlmann@adobe.com 2010-09-09
Parent: [r626]
Child: [r628]