Rather than testing for (--filter= OR --filter), and then disambiguating within, it seems just as easy to just do the tests for --filter= and --filter at the top level.