0.12dev: Minor consistency fixes.
Part of #7715.
Authored by: rblank 2009-06-22
Parent: [r8282]
Child: [r8284]