CSHARP-893: Code review changes.