Issue #181: Minor refactor.