Done in 66b1405. Let me know if you want me to rebase these ping pong commits.