Thanks for reporting. Check-in [3eec9d20bd] now has a modified version
of your proposed solution.