I reverted this & a couple of other style-only changes. I hope I catched them all. :)