Lexer should be a bit smarter now