Note to myself: yes, try to move to `whenDone`