Patches pushed as 7f96fb3f4591890bc324426b21dbfc386512f546 and
following.
Thanks.