Font-lock tweaks, remove cb prefix from init macros