More style and logic fixes for the clipper.