Refactorings throughout.