CSHARP-797: Addressing code review comments.