cma_core.ch: Improve coding style
Clean up cma_core.ch coding style.
Better to target to S3_1 too, as there's probable going to be more work on top of this in that branch too, and for that we want to keep base diff minimal.
Clean up cma_core.ch coding style.