Style tweaks and some *IDG->IGD in UPnP code