Patches pushed as f65b1b5232838d6f435e8779e599cfe8121ee576 and
following.
Thanks.