Async-safety for generators improved!