More refactoring for 'sources' design.