Style changes that seemed to make unit tests pass?

They failed. I tweaked stuff. They passed.