Complete the switch to OTDRE

Since ac1e026f OTDRE is the default in CompilerOptions, which stirred up some dust, showing that this weavingScheme is not fully handled in some tool layers.