Merging in an old refactor.