Add some fixes for bnode predicates.