Patches remaining predicate misuses

Adds explicit predicates to the remaining methods that aren't using
them.