Agreed. I'd rather do that systematically in a new PR, though.