Comment 2 for bug 240608

I'm dropping this from the 0.9 milestone because it can't be done without risk of regressions at this point, but it will get done for a later release (I've speculatively targetted it to 1.0 now)