Very minor style changes to reduce diff.