Reformat: fix formatting with Visual Studio.  No functional changes

- Can't say I like how the tool formats some things, but I do like it when programs format for me, so whatever.