Patches pushed as f39d8d2ca96b15c4d415a36932526e1dd9ee212c and
following.
Thanks.