Patches pushed as 78ecc653b841b329cde93f4d176f510306e3a808 and
following.
Thanks.