Touch-ups related to PR #757.