Use TCollectionProxyInfo, not obsolete CollFuncTable
Use name of typedef when needed
Merge pull request #2153 from wmtan/MoreFixesForROOT6relvals

More fixes for root6 relvals