Lexer refactoring (...), tad of Parser cleaning