I agree that PRs against this PR until we're all satisfied is the best way forward.