Also save predicate cross-referencing information for self and super calls