Patches pushed as 4f77ece9d5fc2aeb7e1edf3a942fbd08a28a061b and
following.
Thanks.