Avoid some duplication introduced by pull request 344.