Got rid of ContainMatcher, which is no longer being used.