Clean up of the StringTemplate.
Uniformization + remove "target is collection" exception