Reworked argument parsing and --help/--version handling, again...