diff --git a/src/MongoDB.Driver.Core/Core/Authentication/Oidc/OidcConfiguration.cs b/src/MongoDB.Driver.Core/Core/Authentication/Oidc/OidcConfiguration.cs
index bb5628258e9..91f58547f24 100644
--- a/src/MongoDB.Driver.Core/Core/Authentication/Oidc/OidcConfiguration.cs
+++ b/src/MongoDB.Driver.Core/Core/Authentication/Oidc/OidcConfiguration.cs
@@ -39,27 +39,24 @@ public OidcConfiguration(
             EndPoints = Ensure.IsNotNullOrEmpty(endPoints, nameof(endPoints));
             Ensure.IsNotNull(authMechanismProperties, nameof(authMechanismProperties));
             PrincipalName = principalName;
-
-            if (authMechanismProperties != null)
+            
+            foreach (var authorizationProperty in authMechanismProperties)
             {
-                foreach (var authorizationProperty in authMechanismProperties)
+                switch (authorizationProperty.Key)
                 {
-                    switch (authorizationProperty.Key)
-                    {
-                        case CallbackMechanismPropertyName:
-                            Callback = GetProperty<IOidcCallback>(authorizationProperty);
-                            break;
-                        case EnvironmentMechanismPropertyName:
-                            Environment = GetProperty<string>(authorizationProperty);
-                            break;
-                        case TokenResourceMechanismPropertyName:
-                            TokenResource = GetProperty<string>(authorizationProperty);
-                            break;
-                        default:
-                            throw new ArgumentException(
-                                $"Unknown OIDC property '{authorizationProperty.Key}'.",
-                                authorizationProperty.Key);
-                    }
+                    case CallbackMechanismPropertyName:
+                        Callback = GetProperty<IOidcCallback>(authorizationProperty);
+                        break;
+                    case EnvironmentMechanismPropertyName:
+                        Environment = GetProperty<string>(authorizationProperty);
+                        break;
+                    case TokenResourceMechanismPropertyName:
+                        TokenResource = GetProperty<string>(authorizationProperty);
+                        break;
+                    default:
+                        throw new ArgumentException(
+                            $"Unknown OIDC property '{authorizationProperty.Key}'.",
+                            authorizationProperty.Key);
                 }
             }
 
diff --git a/src/MongoDB.Driver/Encryption/ExplicitEncryptionLibMongoCryptController.cs b/src/MongoDB.Driver/Encryption/ExplicitEncryptionLibMongoCryptController.cs
index a3b40994a6f..153ad21b5a4 100644
--- a/src/MongoDB.Driver/Encryption/ExplicitEncryptionLibMongoCryptController.cs
+++ b/src/MongoDB.Driver/Encryption/ExplicitEncryptionLibMongoCryptController.cs
@@ -232,7 +232,7 @@ public BsonValue EncryptField(
                     contentionFactor: encryptOptions.ContentionFactor,
                     encryptOptions.Algorithm,
                     wrappedValueBytes,
-                    ToBsonIfNotNull(encryptOptions?.RangeOptions?.CreateDocument()),
+                    ToBsonIfNotNull(encryptOptions.RangeOptions?.CreateDocument()),
                     isExpressionMode);
 
                 using (context)
@@ -267,7 +267,7 @@ public async Task<BsonValue> EncryptFieldAsync(
                     contentionFactor: encryptOptions.ContentionFactor,
                     encryptOptions.Algorithm,
                     wrappedValueBytes,
-                    ToBsonIfNotNull(encryptOptions?.RangeOptions?.CreateDocument()),
+                    ToBsonIfNotNull(encryptOptions.RangeOptions?.CreateDocument()),
                     isExpressionMode);
 
                 using (context)
diff --git a/src/MongoDB.Driver/Linq/Linq2Implementation/Translators/AggregateLanguageTranslator.cs b/src/MongoDB.Driver/Linq/Linq2Implementation/Translators/AggregateLanguageTranslator.cs
index 73229806ec6..deed6e3378a 100644
--- a/src/MongoDB.Driver/Linq/Linq2Implementation/Translators/AggregateLanguageTranslator.cs
+++ b/src/MongoDB.Driver/Linq/Linq2Implementation/Translators/AggregateLanguageTranslator.cs
@@ -505,7 +505,7 @@ private BsonValue TranslateNewDateTime(NewExpression node)
 
             return new BsonDocument("$dateFromParts", new BsonDocument
             {
-                { "year", year, year != null },
+                { "year", year },
                 { "month", month, month != null },
                 { "day", day, day != null },
                 { "hour", hour, hour != null },