Patches pushed as d2f297894ad958449a514113ca97f96de5b39c62 and
following.
Thanks.