Some small changes.

Hope that is okay as it is; using the stream instead of fetching the body
completely before parsing should improve performance a bit.