OCSADV-23: Formatting cleanup.