[trunk] Further simplifying the code in OptionUtilities.cs
[trunk] Further simplifying the code in OptionUtilities.cs

markfinal/BuildAMation,markfinal/BuildAMation,markfinal/BuildAMation,markfinal/BuildAMation,markfinal/BuildAMation