Patch 1093958 from Felipe Contreras. It fixes stuff.

I also made some tweaks to make valgrind a bit happier.