Some small readability refactoring.