I've updated the git tree with the Kconfig type fix, the instance
fixup from Keith (plus extensive comments explaning the issue) and
the various reviews.  I'll wait for the buildbot a and do a little
more manual testing and will send it to Jens in the afternoon.