In future we may need to consider other deferral modes like @kimchy 's `serial` approach (although I tried adding that to this PR and failed due to the many extra changes that would be required - I'll save that discussion for another issue)