Add some heuristics in the lexical classifier to make it play better wit...

...h the syntactic classifier when classifying expressions involving generics.
Fold into one line.