Minimal refactoring.