I think the refactoring that Tommy asked for addresses this... Does it?