Improve varsymbol highlighting