config.ConfigWrapper -> config.Wrapper
Style tweaks on UPnP code