Minor shader cleanup, fix a build error (see #4160)