Improved argument parsing functionality.
...