Some minor cleaning up (so that we can build the OpenCOR executable without any plugin if we need/want).