Better matching to recompose TypeApply

- Patch avoiding to store type of names (Type or Term).