Simplified searching

The extra arguments passed to grep are now passed directly, instead of
taking the extra detour through GREP_EXTRA_ARGS