Changes per David H on pull request.