Replace the indirect response building with a more direct approach.