Added support for highlighting generic procs/etc