make format
With visual inspection that nothing got worse.
[Squashed commits to make git blame etc. more likely to work. -ED]