Don't hide parameterized headers.

Parameterized headers were being hidden when there were no plain
headers.
Fixing broken tests.

Oops, forgot to run these with b41cf793dd48e1f743fc2b024bc4fc5fbce3e1e7.
Mondays!