More refactoring preparation.