Update to pretty printing - without use of broken toprettyxml.