I think this looks okay. @hchiorean?

(BTW, next time I'd suggest adding questions like this as line comments in the PR.)