Fixed a few typos in the new generalized templates.