Fixes a condition in Disposable that could infinitely recurse.
Renames Action -> Task.