Avoid direct use of TType
Merge pull request #5227 from wmtan/DoNotUseTType

Avoid direct use of TType in ObjectWithDIct