Tidying up persited Predicate conversion

Instead of relying on the implementation class name, attempt to lean
on the the #predicate method.