[PATCH 21.4] Fix font-lock-{add,remove}-keywords