I'd be OK with that approach. Do you have a patch we can try out? No, but I suggested it to Eric before. He's closer to it than I and can probably more easily write and test it. I can do it later this week if he doesn't get a chance first.