Fix xml_composite() warnings and notices about arguments