I think all that's left is a squash of commits, then r+ from me.