> I've made enough progress that this should be usable by now.

I found a few more corner cases while using it.  I'll push to master
soon.