Thanks -- I checked in a variant of your fix. It also appeared in PollEvent.
Should be available via cvs update now. A new tarball will get built automatically tonight.