catch up matcher_covered.{cpp,h} with upstream/master
Make progress, take out some more trash