In the end, the best approach is to update the text in 4.3.3 (which describes
mode selection on the transmit side) to prescribe that C mode must be used for
large messages and to define what 'large' means. The text in section 5.8.1.2/3
and 5.8.2 then just needs tidying up.