A valid change, I think, but it doesn't belong in this patch.