A few more coding style things.