So it seems to me that the refactoring ideas in this area have not quite crystallized yet and my selfish little patch can be committed for now? -Artem.