One of many refactorings.