Remove short array usage.