Further shader simplifications