Clean up predicates prior to xpath normalization