Fix redundant "typename typename T" in Visual Studio Native Visualizer

Also, a little minor cleanup


git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@265338 91177308-0d34-0410-b5e6-96231b3b80d8

utils/ClangVisualizers/clang.natvis

@@ -57,8 +57,8 @@ For later versions of Visual Studio, no setup is required-->
   <Type Name="clang::PointerType">
     <DisplayString>{PointeeType, view(poly)} *</DisplayString>
     <Expand>
-      <ExpandedItem>*(clang::Type *)this, view(cmn)</ExpandedItem>
       <Item Name="PointeeType">PointeeType</Item>
+      <ExpandedItem>*(clang::Type *)this, view(cmn)</ExpandedItem>
     </Expand>
   </Type>
   <!-- We visualize all inner types for clang reference types. So a rvalue reference to an lvalue reference
@@ -191,7 +191,8 @@ For later versions of Visual Studio, no setup is required-->
     </Expand>
   </Type>
   <Type Name="clang::TemplateTypeParmType">
-    <DisplayString>typename {*TTPDecl,view(cpp)}</DisplayString>
+    <DisplayString IncludeView="cpp">{*TTPDecl,view(cpp)}</DisplayString>
+    <DisplayString>{*TTPDecl}</DisplayString>
   </Type>
   <Type Name="clang::InjectedClassNameType">
     <DisplayString>{*Decl,view(cpp)}</DisplayString>