Refactoring various predicates for owise.
Fix warning + some pedantic whitespace stuff.