As discussed above and because this comment thread is getting very long, I'm going to start proposing smaller issues off of this one.  In this way we can start committing as we reach agreement, and hash out any disagreements in more focused contexts around smaller patches.  I will copy the nosy list unless I hear otherwise from anyone.

> Patch 2 could indeed committed separately,

I created issue 17284 for this.