Patches pushed as 875b0bf640ce7a8d959b218c180a0b400b9d0290 and
following.
Thanks.