Fix quadratic command-line parsing

Fix quadratic command-line parsing #1075