Move response delegation out of question.
Switch to use response delegator.