@shane-tomlinson and I discussed this yesterday. I'll open a separate issue for the inclusion of deferreds here and avoid blocking the PR on that count.