Some work towards making the code of pull request #445 more OpenCOR like (#449).