Use grep-regexp-alist and add missing require form