Revert "Set extra font lock keywords more robustly."

This reverts commit 116737e96507bc292869b8fe32aafa185921d264.