Fix bug in treeRecomposer

- Extensive use of TypeName for simplification.
Merge branch 'master' of https://github.com/aghosn/persistence