Patches pushed as 56f73178e4a2e50f1bc9c5553117000f1781fad9 and
following.
Thanks.