Clean-up

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

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1620815 13f79535-47bb-0310-9956-ffa450edef68
Avoid NPE when using JspC

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