Patches pushed as 740854ff06fbde8a3f3554ae4591f0944671e4ee and
following.
Thanks.