CSHARP-790: Addressed code review comments.