Minor abstraction refactoring.