More refactorings.