Synchronize with changes to crun API and internals.