Improved Disposer typing to facilitate more compile-time checks.