glsl: Simplify aggregate type inference to prepare for ARB_arrays_of_arrays.