New commit uploaded that I think implements what you mean. Let me know if it's on-target.