More style fixes. Style fixes for reviewing Change Requests.