Get unparameterized subtypes to display properly in Type Hierarchy view.
Merge branch 'CHBnfChanges' into ClassHierarchy