Support even newer tpt functions.