Severity: minor

This is a followup inspired by a recent commit by Stefan Kangas
"Assume font-lock is provided; it's preloaded since 22.1".

In that case, we can safely shave off some fallback conditionals.
Patch attached.

--
Cheers,
haj