Comment 2 for bug 402652

I am looking at this; it may be splittable into some separate bits that we can parallelise on; please feel free to look and think about this in parallel with me; with only 4 bugs left till release a little overlap won't hurt.