major refactoring, @Templated root expressions now parsed as separate elements