Patches pushed as e961f15083e71abfd16b74a10331c9297960370d and following. Thanks.