WithHeaders stuff is basically a dupe of the non header stuff

So remove it, reducing the amount of code