Other code style changes.