Patches pushed as 7b207e08492998bb91ac99f703f193d32dfee31e and
following.
Thanks.