Fix owning raw pointers in matcher/

There are a few old school owning raw pointers in the matcher/ directory that lead to a number of discouraged 'release()' and 'new' calls. We should remove them so our old code is a better example of what we want our new code to look like.