If you'd like to continue with the rest of these cleanup changes, that would be nice.
However, the main problems in bug 6856 have been taken care of, so I wouldn't
blame you if you'd just as soon leave it that. Thanks for your work on this.
I've already been running this in a fork for almost a year. I don't care what illumos-gate does with it, but I'm long done with it.