Cleanup refactorings.