Make weave safer for async.