Minor code readability improvements.
Cirrect bug where newly created templates and archetypes did not have a concept term properly serialised.