Fix a pile of style/formatting issues.