Continuing SRP refactorings.