Code clean-up of matching predicate handling (logic-preserving change) (related to #101)
Code clean-up of matching predicate handling (logic-preserving change) (related to #101)

bbcarchdev/spindle,bbcarchdev/spindle