Correct some errors in r1577182

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1577195 13f79535-47bb-0310-9956-ffa450edef68
Clean-up / consistency

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1577201 13f79535-47bb-0310-9956-ffa450edef68