Split branches on `when Bar, Baz` (#17072)