Done. I just rebased, so I'm not going to push until right before I merge if you're still looking things over.