This has the side-effect of being able to remove use of `inlineCallbacks` in the test-cases for cleaner tracebacks.