Changes resulting from only keeping addrInfo as type xml.