Random coding style fixes and simplifications (trivial).