Improve highlighting of mentions. (Closes #60)