Yes, it is _that_ obvious.  If someone does a connect (its not 
required, but one can) the C-E may have already been sent by
the time the first DATA is available.  Don't calculate in the C-E
bundling overhead if we've already sent the C-E.