Tweaks to PR #672.