TSi/TSr payloadified (sic).