Mixing in formatting fixes makes reviewing hard.