More ocp-indent (no functional change)