added some left over T_xxx usages