Rewrite lexer to comply with CQL spec