Patches pushed as 337fe45544c2e89127d79557f9a05a0fa237c779 and
following.
Thanks.