More minor refactorings.