Updated command argument parsing.