array_index properly accounts for the changes in sizes of array
items. Use it.

Change-Id: I0dd0fb70f968a2b837a3d2aa02ae3d02ad5a578a