Updates to matchers

Look at individual commit messages for details.