bah, let's leave it as it is for now. I think it would be good to move on. I don't know what @ellisonbg think of it but I would almost be inclined of merging as-is and refine the details later. In part because the PR is huge, and it will be easier to track smaller changes.