Add templating desguaring pass