Improved response parsing.