Single-letter uppercase constants

[Gama11]

Uppercase identifiers are highlighted as variables, rather than types, but there's an exception for single-letter uppercase identifiers (mostly because that's a common in type paramters, e.g. T). This leads to issues like this:

We can probably get rid of this hack because the grammar should know about the places where type parameters can occur by now, and still highlight T etc correctly as a result.