Avoid unnecessary use of TType
Merge pull request #5516 from wmtan/AvoidUnnecessaryTTypeUse

Avoid unnecessary use of TType