CSHARP-874 - Made the generic and non generic versions of the options builder the same for consistency.