Combine API for match= and matches=; fixes #733 and #734

This should allow the use of both `match` and `matches` in the API for multiple matches.