Patches pushed as 7245773eb60460e79d3629e7b5e8f93b3748882c and
following.
Thanks.