Further source refactor.