Now uses pugixml for xml parsing (so much nicer).  Ctrl^O works now.