Final fixes to the header emitter setup for the new API.