Nice refactorings.