Done, I put this change in a new commit. If you'd like I can squash them in one. I'm not sure about the policy here.