Remove use of NodeIdentifierWithPredicates constructors