A bit more work on tree conversion.