Comment by danra

I've always advocated for smaller atomic refactors.

...oh. Never mind.