Patches pushed as c1563fc116584cec517c9f5c866c661d3e7cec4e and
following.
Thanks.