Bug fix: disallow a variable template to be redeclared as a non-templated variable