Coerce matcher.or/and arguments into matchers

As discussed in #413