It would cost quite some work to split this into more commits sensibly, and there would probably be little gain.