small changes to make typing predicates clearer