OK, you do that. This PR is fine by me, so merge when you're ready.