Cosmetic changes to prepare for refactoring.