CSHARP-803 - Incorporated review comments.