Unify templated tags.

We don't use a space at the end anymore for any other tag.