Update the length-tracking of wrapping-headers.

  Ths updates #194.