Minor refactoring to remove redundancies.