Some readability refactorings.