Note that this formatting issue runs across most of these diffs, not just the one I pointed out.