Mostly code style changes.