Migrate off of deprecated NodeIdentifierWithPredicates methods