Improve best-mention context.