Minor style refactoring.