Sixth batch of code review style tweaks