Addressing #68 & #69

. . . where flaws in mention detection affected regular mentions as well
as advanced matching.