Improve operator lexing