release-build failures noted in bug 1041645.

This is a critical bugfix.  I'm not going to backport it, though (no time).