dry up this case / when

A few branches are repeats, this just cleans up some of them.