Following discussion with Valeriy on IRC, I'll propose the attached patch for public review on GitHub.
Following discussion with Valeriy on IRC, I'll propose the attached patch for public review on GitHub.