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