Sync with updates to crun.py.