Some minor cleaning up (which, incidentally, re-allow the building of the CLI version of OpenCOR on Windows).