Get MethodHierarchy to work.
Merge branch 'CHBnfChanges' into ClassHierarchy.  Method hierarchy now works.