6g cleanup suggested by ken. remove TPTR wrapper around TMAP, TCHAN, TSTRING. R=ken OCL=22406 CL=22409