Further stabilisation of refactoring to eliminate odiparams.bat config