A few simple refactorings.