Improve highlighting of referents.