Clean-up of minor formatting issues in r354542/3/4