Minor readability/consistency refactoring.