CDK-647: More formatting.