Change the main esi_deliver loop to also use ObjIter