Start converting indexed arrays over to new scheme