More C switches. I have other comments re: this above