Minor refactoring after code inspection.