Patches pushed as e92afc59048502a4a23ea5866522ba5f3ccc8aba and
following.
Thanks.