Implements the new matcher API.
6 files changed