Fixing condition filter to accept functions; generate predicates.