Tweaks to PR #763.

#693.