[jbacelar]

Originally Posted by capink

As a transitional step, I might post a new version that implements the first solution, and then decide whether to pursue the second option or not.

That seems like the most sensible step to me.