Change more scope access to use BB.