Do some more cleanups in anticipation of more flexible compute shader outputs.