A few more structural updates for job control.