I don't feel particularly strongly about these, but the only way to comment was to cause a diff. Let's pick one and go with it. I prefer the ones I didn't delete.