Small refactorings for cleanliness.