This pull request just exists to have a place to put comments.  Please don't pull!

Oh, and integrate the patching into the build process?