Switch to new when/is/otherwise with break