ENHANCED: Rewriting S-representation-specific predicates as generic graph predicates.