Patches pushed as 86a6749fbb0f3235fb5ee975d2288997aecd8409 and following.
Closing.