Fix some coding style things.