Excellent idea, I have used your solution in the latest commit.