Patches pushed as 3eec0e9b63c96f8839dff38881262865d8a14ec9 and
following.
Thanks.