More etree formatting fixes.