Patches pushed as 36d4877041e0651d1af56b47127b8566c0fd0259 and
following.
Thanks.