Clean up '&' parsing in lexer
Clean up '|' parsing in lexer