I think we should either remove the options and have a policy of having them off, or else make config not complain about redundant exact-matching options. It's not like there is any real confusion about intent if options DIAGNOSTIC is in GENERIC.local and a xen GENERIC.