Code cleanup (#14766).
Patch by Daniel Felix.
Authored by: jplang 2014-01-11
Parent: [r12657]
Child: [r12659]