More style cleanups.