Better bnode handling.