Style fixes as per Robert's requests.