Jon, if you want we can probably get you some spare cycles to help with the PG side. Sounds like you're pretty busy ...
Thanks for the update. I agree that we still want to work on improving/fixing (take your choice) these, in particular removing the overlap and redundancy that's there. A straight port will get us on the move for now, though.
