Fix: use new CommandLineLib4 API for DefinedSwitch