Use printf_xml in a few more places