Fixed further uses of short array notation.