All matcher improvements

This cleans up a few inaccuracies that I noticed post-merge of #491.

/cc @yelled3