Make predicate less obtuse

[#63337780]

Signed-off-by: John Tuley <jtuley@pivotallabs.com>
Reorganize methods for readability

Signed-off-by: John Tuley <jtuley@pivotallabs.com>