Better handling of body decode.