Additional style fixes on code merged from #1160.