This sounds fine. What was decided before was also fine, to me. Please get @carcosa back I really am of the opinion this was a minor struggle session at worst and this isn't a capital offense it was just a slightly badly implemented solution to a real issue.