LUCENE-4956: more cleanups and remove n^2 in filterIncorrect

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene4956@1536244 13f79535-47bb-0310-9956-ffa450edef68