Make finishing-first-job look okay. Fixes #399.