Constant and type variables are now properly highlighted.