Slightly improved the sanity of the default options.