Fix incomplete refactor.