Adding matcher that works on keys and can be combined with other matchers, and fixing some lingering concurrency issues.