Attempt to prevent warnings.

  This updates #223.

  I think this fixes half the problems, but there are still more.

  This is why new-release is hard.  I hate MIME.