Fuel font lock improvements

Various small fixes to make font-locking more consistent. There are some places in which font-locks regexps gets fooled which this pr addresses.