CSHARP-1055: Code review changes.