Cleanup helper definitions and get req/resp parity.