Comment 12 for bug 739774

I definitively found one place where this wreaks havoc, and I'll upload a fix for that in a minute. It remains to be seen whether this is the only place where things go wrong, but as the scripts are very hard to test without a cow (chicken-egg problem), I'll upload this and test tomorrow's daily CD.