Revert erroneous bug fix
Make use of `font-lock-flush` when available
Mark variables and functions as internal, add notes