I'm going to wait and see how the conversation with Ioan goes before putting more time into this change, but I certainly see your point.  I'll comment the code more if this design is OK.