More style-only changes.