[JAVA-1391] Changes suggested by Jeff in the pull request.