Fix up header generation to be less invasive, document