Win-side cleanup from previous commit; more goofy formatting fixes