First pass on the etree issue (#80)