Updated mention expansion code, documented a limitation of mentions
(the last defined value is used)