byExtraPredicate is now byMandatoryPredicate so it can play nicely with and/or mode
remove unecessary suppressWarnings