Rename MatchState to BijectionMatcher.