Minor changes to bnry, taken to v4