Some more work on the Matcher-API.