Stopped the template typdef __...  dance.