Rewrite a couple switch blocks