I've attached a small patch that unifies the three calls to
grep_commandline_arg in grep.c's main:

I've also pushed an even less substantial patch to alphabetize some
enum names, here:
http://git.savannah.gnu.org/cgit/grep.git/commit/?id=f240c9477c7d76b74dbbc9390c727d49d3c7bc88