For me, more the number of splits a commit can be divided into, the better. Even for simple 2-line cleanup, I'd not do it with the current patch I'm doing. This irks my fellow programmers sometimes though, who just want to get the work done.
I've developed this habit as a consequence of using history to understand the context of a piece of code. Big commits make life harder for future maintainers.