CSHARP-666: Changed implementation of Dispose in new classes to match canonical implementation.