@simonvanderveldt yes, it would be nice to have some global code.  Currently, we (and @al3xandru’s patch) remove everything before the first two newlines (which expects that the line after the metadata block is empty — which is not mandated) if we are running in one-file mode.  We could switch it to some more intelligent code.  Issue #973.