Shader module cleanups

Great stuff!