I've fixed this in the process of doing all the async-cancellation code.