Simplify disposable handling

These conform to the 3.0 implementation in some measure. But I'm not sure this is correct attitude especially on af2d829