Cleanup of helm-grep hacks.
Hack to fix rare helm--maybe-update-keymap errors (could be a bad idea)