Simplifying the implementation a lot

Now that we’re not treating cancellationActions very differently.