Here's a fix to this bug.  Tests pass, and performance appears to be
back here.

I've assigned copyright to the FSF for Guile so it should be fine to
commit!