I'm always wary of changing too much lines when I don't really need to, especially in big patches.

how about doing this in a follow up patch too?