Patches pushed as ca23ba4f283a65f6ae26c6cd862ca918427600d5 and
following.
Thanks.