Improve CtrlP and C highlighting.