Well, cancelling does the right thing, but yes working on converting the CancelledError to a TimedOutError or something.  :)