Oops.
More refactor.