More style-guide fixes.