bson: clean up some nits