Improved font-lock code to use a better `PRE-MATCH-FORM`. As a result