I think I've convinced myself that your plan is better and we shouldn't infer anything which means I need to rework the formname stuff.