On the face of it, this is a fairly trivial issue: When we added variable templates, we didn't augment the definition of "template". I don't think we need to make this issue bigger than necessary, given that we don't refer to a plain "template" often (because it's not a super-useful term in its generality).

Note that we nowadays have the term "templated entity" that can be used when we wan to talk about "something that is dependent on a template parameter".

Thus, I'll re-offer the change from #425 (with the Oxford comma) as the appropriate fix here.