Font-locking tweaks