Continuing work on flattening the generated XML.