Fixups for body-decoding.

  Not 100% sure this is correct, but it is progress.

  This is part of #101.