More style fixes and more attempts to make sure this compiles between GCC and MSVC.