Make Context implement more of MatcherContext

Ideally, MatcherContext should die, the problem however is that all matchers
will have to be changed...