Patches pushed as 82f4d5d2cd8a7b78d3bf4f59a462df873a997b66 and
following.
Thanks.