If you can port as you suggest, then ping me, and I'll try to make sure it passes -- I'll probably be able to find time for a few quick fixes, if needed.