Another small refactoring.