mostly cosmetic sync with the mainline bubinga code