No concat of empty strings.
Fixing origins constant strings in templates.
Updated more string construction sites.