Patches remaining predicate misuses

Adds explicit predicates to the remaining methods that aren't using
them.
Merge pull request #479 from lukecampbell/nightly_fix

Patches remaining predicate misuses