Minor clean up after PR #214