Patches pushed as 84aef8392b7a08abc91789b83aaf1e40bc7b0ecb and
following.
Thanks.