Catch up with upstream.
Be more careful about running a xact bound function in the binding thread, as can happen with futures becoming ready fast.