Invalid cq:template references in generated template types

[HitmanInWis]

In a default project created from Archetype, with project name of mysite, the following are invalid:

• template type page has cq:template="/conf/mysite/settings/wcm/templates/page-content" (this is a circular reference to one of possibly many child templates)
• template type xf has cq:template="/conf/mysite/settings/wcm/templates/empty-experience-fragment" (this path doesnt exist)

The generated template types should probably omit cq:template from their structure/initial content all together.