LUCENE-4956: Simplier fix for the broken posIncr. I also cleaned up the Token class and made private to the Filter