correct mangled template and properly bootstrap
grammar
Merge pull request #1493 from craigh/templatecorrections

Template corrections