lexer cleanup, this produces smaller token manager classes
Authored by: rbri 2014-12-10
Parent: [r441]
Child: [r443]