Patches pushed as e26a149e22e46fa37d0b34e1d0341a227d3fa907 and following. Thanks.