Code consistency tweaks.
Minor refactoring, etc.