glsl2: Eliminate tokens for square matrix short names