> But we are bike-shedding.

Indeed.  How about the attached patch?

martin