ENG-4314 Review feedback - get rid of StreamPredicate class.