CSHARP-933: Reduce the number of places nulls, actual types and discriminators are handled.