Cleaning up the handling of responses.
Working on the v10 rewrite.