CSHARP-797: Changes in response to code review comments and getting tests to pass against server 2.4.