Patches applied as df5653adcbd1f9799f810f46d514b2ca4112af97 and
following.
Thanks.