Rebased attempt at hyperlinking mentions inline.

This is just a rebased and squished version of #899.