Don't clear headers, remove them.

Empty headers aren't emitted in the output anyway, so no point in keeping
them around. And more importantly, there is no point in creating them just
to clear them.

Minor order change in one unit test, does not change semantics.