More work on tree conversion.