Tidy up a few missed things in shader.cpp