Couple more code style things.