FWIW, the whitespace changes were made intentionally since I was modifying the nearby code (slowly have been moving away from tabs to vim equivalent of "set ts=2, set expandtab"), and making them incrementally when modifying local functions avoids a "rip the bandaid approach" like using indent and redoing everything at once.

What do you think?