Cleanup and more work on header field downgrading