Fix subtask code to handle (tests) running in eager mode.