Improve ptrv/font-lock-keywords