I think we should go ahead and make an extension for the source headers, and Hats can later overwrite it if he wants to. Things are moving fast with 4.x repo and I don't see a reason to wait. I have some spare hours today, and I will see about putting up an extension for it, and Hats or anyone who wants to be the one to maintain the extension long term is free to replace it.