[A21.4] Adapt to differences in compiled font-lock lists