more renaming and small affinements on expression [tree] analyse