Command-line parsing updated.