At this point, I feel I've demonstrated the limit of what can be made into WARNINGs, giving us a range of options for now and into the beta. I'll rebase and move the 0002 patch to be in last position so as to tee up 0003-0004 for consideration.
And here's the rebase (after bde2fb797aaebcbe06bf60f330ba5a068f17dda7).
The order of the patches is different, but the purpose of each is the same as before.