Some smaller refactorizations.