cleanups to follow vim.cup syntax highlighting rules.