Minor code cleanup from comments in pull request #1736