Sounds good, I've filed bug 967405 to take care of this with a preliminary idea of how we could fix the problem.