Editing: AbstractContextAwareMatcher.php