Issue #1341: Tiny refactoring.