I guess we can close this. We will drop Waf support soon after 1.26 and so it probably isn't worth to spend more time into this.

—
Reply to this email directly or view it on GitHub.