Opened another PR improving CLIArgs option parsing robustness. Focused on handling edge cases safely without changing existing behavior. Would appreciate any feedback when you get time.