Changed handling of default options.