Minor refactor.