egads. I had the exact same issue when fixing txkazoo.

would it be a lot of work to fix the stuff that patches in the wrong spot?