Minor minor refactoring.