Another small refactor.