more work leading up to exchange allocation header removal

continued from #7495