Fixed up the variant configuration

The variants in the configuration now only ensure that setup.X has a
value rather than overwritting any that might be in the configuration.