Patches pushed as d68517059f12f9adf86adfa3f087ab7d93bc2f15 and
following.
Thanks.