Patches pushed as 73654708bf2a14cc557ccc1ccf76514e67abf83b and
following.
Thanks.