CSHARP-797: A bunch of small changes in response to code review comments.