Bug 905974 - [bb][refactor] Switches