Well… never officially resolved, but it appears that SOTO's proposal above was more or less implemented, and I agree that it flows quite well.
