Shader module cleanups

here as well...