Simplify cancelling as well. See previous commit.