Update lexer to be more JFlex friendly