Break out all cmdline parsing for matcher settings.

These are now handed by the matcher code.