CSHARP-700: Revised after code review.