Fixed 'Bug 21086 - Highlighting issue with generic constraints'.