Formatting changes for CPS code.