I don't see any of Ben's fixes in cvs, maybe they are on a different branch than my copy.
I uploaded a patch for my fixes here
