Comment 13 for bug 1241783

Aargh, some of the changes from the patch for bug #1248753 are also missing. Here they are again, as applied to the current release. That should clear the compiler warnings (and it makes the code a bit neater).