Use 't' prefix for parser tokens more consistently