Shift Lexer responsibilities to Parser; Compress names