Revert the "--json" advice.
Fix header handling.