> It's good to have more deletions thand adds in a PR :)

I always find it a bit disconcerting to see how small the margin is in refactors like this. I would feel so much more reassured that it was the right thing if the line count excluded comments and whitespace in such cases!