Bug fixes to the mention finding and tagging code.