BUG-5626: eliminate SwitchBehaviorSupplier