Port the updates to the job_container code to ascent to resolve some bugs in the iterator code.