[Parser] Minor update, [Emacs] Update on keywords