More style-related fixes.