Fix grammar to parse type parameters with arrays.