Comment improvements
Better failure_matcher? implementation