Minor style changes.
More style cleanup.