Simplify

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1532540 13f79535-47bb-0310-9956-ffa450edef68
Fix Gump failures when the SCI scan finds too many classes.

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