Tweaks to header emission.
More header emitter tests.