master: Only pass along headers that aren't empty.