Bugfixes and cleanups in new well shaders.