Core: CommandLineParser fix redundant code