Revert "Doesn't require a function declaration for the predicate"

This reverts commit a4dabeee7c7d08fe20b5f895b7adc2312ffb1367.