Refactors the when that always break