This hole stuff can probably be simplified using directly UPnPVarChangeCollector, but we can defer that to a separate change.