Simplify font-locking of types used in font-locking