Style fixes and -Walls for a couple files.