Even more refactorings.