Wow, yeah, that simplifies things dramatically. I'll fix and rebase.