Disposable fixup

- Implement IDisposable interface correctly, with sealed classes where possible for simplicity.
- Add using statement around undisposed local variables.
Was removing the `IDisposable` here intentional?