Internal changes to reflect merge of tpq and tid protocols.