Fix tyop.
Remove accidental inclusion from elsewhere.
Rename a template thing.