[WIP-3] Cleanup response handling.