Okay!
I did run this through astyle with the preferred settings from the wiki, though.