Some style fixes to keep things consistent after recent pull request integration.