SERVER-9561 Possibly better options handling