Patches pushed as e08ae5900a16ac29e6adc369f513f574137eb86e and
following.
Thanks.