Closing as duplicate of HSEARCH-3752: we'll handle everything there, as I expect the solution to be common to all predicates (though the tests may not be).