Minor code cleanup from comment in pull request #1748