But I may well just be paranoid about multiple files being a problem. Unless there's objections (don't seem to be so far) I may go ahead and split it up with a package.d. If it turns out to be an issue, I could just deal with it then.
Ok, I'll work on a pull request following your formatting as a separate file. You can take the merging/not merging from there.