Change some array references to arrays.