Fix half-finished refactor.