A few more adjustments to the master merge of ConfigUpdate.