Adapted to changes in benode_t.h