Improved body parsing.